deleted some conflicts