diff --git a/settings.c b/settings.c
index 6e4d55b..4236f4a 100644
--- a/settings.c
+++ b/settings.c
@@ -22,6 +22,7 @@ Slider BT;
 
 bool Settings_IsInit = false;
 
+<<<<<<< HEAD
 void Settings_Initialize (SDL_Renderer* renderer) {
   Initialize_Slider(400,300,Scalar_width,Bar_width,Slider_height,1,2,&BV);
   Initialize_Slider(400,500,Scalar_width,Bar_width,Slider_height,10.0f,20.0f,&BS);
@@ -31,6 +32,17 @@ void Settings_Initialize (SDL_Renderer* renderer) {
   Settings_Ball_Texture = IMG_LoadTexture(renderer, "assets/images/ball.png");
   Settings_Ball_rect = (SDL_Rect){.x = 1200, .y = 300, .w=100, .h=100};
   Settings_IsInit = true;
+=======
+void Settings_Initialize(SDL_Renderer * renderer) {
+    Initialize_Slider(400, 300, Scalar_width, Bar_width, Slider_height, 1, 2, &BV);
+    Initialize_Slider(400, 500, Scalar_width, Bar_width, Slider_height, 10.0f, 20.0f, &BS);
+    Initialize_Slider(400, 700, Scalar_width, Bar_width, Slider_height, 0, 8, &BT);
+    Settings_Texture = IMG_LoadTexture(renderer, "assets/images/settings_title.png");
+    Settings_rect = (SDL_Rect) {.x = 800, .y = 180, .w = 313, .h = 100 };
+    Settings_Ball_Texture = IMG_LoadTexture(renderer, "assets/images/ball.png");
+    Settings_Ball_rect = (SDL_Rect) {.x = 1200, .y = 300, .w = 100, .h = 100 };
+    Settings_IsInit = true;
+>>>>>>> 8a449ac7cd9e04dc1d5c0dbd03991ed27286f197
 }
 
 void Settings_Draw(SDL_Renderer * renderer, Scenery * scenery) {