remove forgotten git-merge signs