fix merge conflic