fixing merge funk