Recover from Merge