fix merge conficts