merge failure repaired