Clean up merge