Clean up merge.