merge collisions fixed