fixed some collisions with older commits