You can take a look at this post which may help you in your problem.
https://www.cs.swarthmore.edu/~adanner/help/git/git-merge.php

Let me know if it helped you. Also fix sim not provisioned error.