fix merge conflit