remove the git merge info by hand, fuck