Deleting some conflicts