Clean up latest merge.