Fixing munged merge