Clean up after Merge