Fixed collisions in merge