fixed some conflicts after commit