merge failure resolved: