Remove mistakenly committed conflicts