fixed some conflicts...