merge unresolved conflict