cleanup mangled merge