fix merge conficts part I