diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 3d91166..32a3118 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -6,9 +6,6 @@ use CodeIgniter\Router\RouteCollection;
  * @var RouteCollection $routes
  */
 $routes->get('/', 'Home::index');
-<<<<<<< Updated upstream
-=======
 $routes->get('/themes', 'ThemeStore::index');
 $routes->post('/themes/upload', 'ThemeStore::upload');
 $routes->get('/themes/preview/(:segment)', 'ThemeStore::preview/$1');
->>>>>>> Stashed changes