Restoring merge (2)