merge conficts fixed