corrected conflicts removal