Merge and Cleanup