You've introduced merge markers here. You really have to pay attention when you merge with git. If it tells you there are conflicts, you have to fix them before you commit.