fix merge bugs 2