remove <<<<<<<< from git merge