Clean Up Merge