Remove conflict commits