Remove leftover diff from merge