Merge conflicts removal