Cleaning up conflict merges