Merge and cleanup