fix merge do