Ahh – super easy to understand. I already knew this – but a refresher to say “do what you have been doing” is always reassuring. HOWEVER …. this is a nice website to read and understand for those dicey situations. http://githubtraining.com/fix-merge-conflict-git-using-sourcetree/