mergeconflict cleanup