Fix merge crufy