fix merge branch