Merge and Clean Up