Remove tail from merge conflicts