Remove some of the persistent unit handling in Merge