diff --git a/Drone/client_config.ini b/Drone/client_config.ini
index bd58322..2efdb0f 100644
--- a/Drone/client_config.ini
+++ b/Drone/client_config.ini
@@ -26,11 +26,7 @@ y_ratio = 1.0
 z_ratio = 1.0
 
 [COPTERS]
-<<<<<<< HEAD
 frame_id = floor
-=======
-frame_id = map
->>>>>>> master
 takeoff_height = 1.0
 takeoff_time = 5.0
 safe_takeoff = False
@@ -42,9 +38,9 @@ z0_common = 0
 
 [FLOOR FRAME]
 parent = aruco_map
-x = 0.0
-y = 0.0
-z = 3.55
+x = 2.1
+y = 11.3
+z = 6.2
 roll = 180
 pitch = 0
 yaw = -90
@@ -57,4 +53,3 @@ led_pin = 21
 x0 = 0
 y0 = 0
 z0 = 0
-