fixed some conflicts again