Fix committed conflicts