Add workspace to git igonore file
Merge latest pull
Update the code to have only the one project and merge all the new code