diff --git a/sources/main.cpp b/sources/main.cpp
index 9c9f5229..bc091ba2 100644
--- a/sources/main.cpp
+++ b/sources/main.cpp
@@ -7,19 +7,8 @@
 
 
 #include <iostream>
-<<<<<<< Updated upstream
-#include <Wal.hpp>
-=======
 #include <cmath>
-#include "Window.hpp"
-#include "Drawables/2D/Text.hpp"
-#include "Drawables/2D/Circle.hpp"
-#include "Controllers/Keyboard.hpp"
-#include "Camera/Camera3D.hpp"
-#include "Drawables/3D/Grid.hpp"
-#include "Drawables/3D/Cube.hpp"
 #include "Wal.hpp"
->>>>>>> Stashed changes
 
 int main()
 {