REMOVED 'HEAD' comment from git conflict