merge application code from spin