Fix merge munge