fixed commit collisions