resolved merger