Fix merge fumble