Removes git conflict markers left over from merge.