fix merge commit issue