You have to pay attention to git. When it tells you there are merge conflicts, you have to go in and fix them. That's what these markers are from.