fixed some conflicts