Clean Up After Merge