fixed some conflicts (?)