Merge Cleanup