diff --git a/src/data.h b/src/data.h
index d04879c..b216717 100644
--- a/src/data.h
+++ b/src/data.h
@@ -134,6 +134,9 @@ typedef struct GameData {
     Map currentMap;
     Mission missions[MAX_MISSIONS];
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 4b87dcb (ui)
     int mapx, mapy; 
 } GameData;
 
@@ -162,7 +165,11 @@ typedef struct {
     GameData data;
     BuildingData buildings[100];
     UnitData units[100];
+<<<<<<< HEAD
 } Game;
 =======
 } GameData;
 >>>>>>> 8e3d2ca (add game structure)
+=======
+} Game;
+>>>>>>> 4b87dcb (ui)
diff --git a/src/draw.c b/src/draw.c
index e95a825..57ef0ce 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -47,6 +47,9 @@ void drawGameData(SDL_Renderer *renderer, const GameData *gameData, SDL_Texture
     // Present the rendered frame
     SDL_RenderPresent(renderer);
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 4b87dcb (ui)
 }
 
 void drawMinimap(SDL_Renderer *renderer, const Map *map, int minimapX, int minimapY, int minimapSize) {
@@ -71,6 +74,9 @@ void drawMinimap(SDL_Renderer *renderer, const Map *map, int minimapX, int minim
     SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
     SDL_Rect minimapBorderRect = {minimapX, minimapY, minimapSize, minimapSize};
     SDL_RenderDrawRect(renderer, &minimapBorderRect);
+<<<<<<< HEAD
 =======
 >>>>>>> 6abc1cd (draw function)
+=======
+>>>>>>> 4b87dcb (ui)
 }
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 41870c7..f2021e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,11 +1,13 @@
 #include <SDL2/SDL.h>
 #include <stdbool.h>
 #include "data.h"
+#include "draw.h"
+#include "input.h"
+#include "ui.h"
 
 const int SCREEN_WIDTH = 800;
 const int SCREEN_HEIGHT = 600;
 
-
 int main(int argc, char* argv[]) {
     SDL_Init(SDL_INIT_VIDEO);
     SDL_Window* window = SDL_CreateWindow("RTS Game", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
@@ -55,4 +57,4 @@ int main(int argc, char* argv[]) {
     SDL_Quit();
 
     return 0;
-}
+}
\ No newline at end of file
diff --git a/src/ui.c b/src/ui.c
index 3ced863..d911331 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -30,6 +30,9 @@ void handleButtonEvents(SDL_Event *event, Button buttons[], int numButtons) {
         handleButtonClick(event, &buttons[i]);
     }
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 4b87dcb (ui)
 }
 
 void drawButtons(SDL_Renderer *renderer, Button buttons[], int numButtons, TTF_Font *font) {
@@ -66,6 +69,9 @@ void drawButtons(SDL_Renderer *renderer, Button buttons[], int numButtons, TTF_F
     // Present renderer
     SDL_RenderPresent(renderer);
 }
+<<<<<<< HEAD
 =======
 }
 >>>>>>> 206ed0e (basic ui controls)
+=======
+>>>>>>> 4b87dcb (ui)
diff --git a/src/ui.h b/src/ui.h
index 137b9b9..2c3ce77 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -9,10 +9,14 @@ typedef struct {
     int x, y, w, h;
     bool clicked;
     void (*onClick)();
+<<<<<<< HEAD
 <<<<<<< HEAD
     char text[50];
 =======
 >>>>>>> 206ed0e (basic ui controls)
+=======
+    char text[50];
+>>>>>>> 4b87dcb (ui)
 } Button;
 
 // Function prototypes
@@ -20,8 +24,12 @@ bool isPointInsideRect(int x, int y, SDL_Rect rect);
 void handleButtonClick(SDL_Event *event, Button *button);
 void handleButtonEvents(SDL_Event *event, Button buttons[], int numButtons);
 <<<<<<< HEAD
+<<<<<<< HEAD
 void drawButtons(SDL_Renderer *renderer, Button buttons[], int numButtons, TTF_Font *font); 
 =======
 >>>>>>> 206ed0e (basic ui controls)
+=======
+void drawButtons(SDL_Renderer *renderer, Button buttons[], int numButtons, TTF_Font *font); 
+>>>>>>> 4b87dcb (ui)
 
 #endif /* UI_H */