fix merge commit