diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index e0043d4..4bd96a7 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -89,9 +89,6 @@ $routes->group('api/v1', ['namespace' => 'App\Controllers\Api\V1', 'filter' => [
     $routes->put('user/themes/(:segment)', 'UserThemeController::update/$1');
     $routes->delete('user/themes/(:segment)', 'UserThemeController::delete/$1');
 });
-<<<<<<< Updated upstream
-=======
 $routes->get('/themes', 'ThemeStore::index');
 $routes->post('/themes/upload', 'ThemeStore::upload');
 $routes->get('/themes/preview/(:segment)', 'ThemeStore::preview/$1');
->>>>>>> Stashed changes