Clean up merge mistake