Clean up manual merge.