Merge clean up.