diff --git a/player/camera_gimbal.gd b/player/camera_gimbal.gd
index 7275a20..442f66a 100644
--- a/player/camera_gimbal.gd
+++ b/player/camera_gimbal.gd
@@ -7,9 +7,15 @@ var locked_mouse_positon = Vector2(0,0)
 var mouse_locked = false
 var mouse_x_velocity = 0
 var mouse_y_velocity = 0
+<<<<<<< HEAD
 var zoom_min = 4
 var zoom_max = 100
 var current_zoom = 8
+=======
+var zoom_min = 0
+var zoom_max = 100
+var current_zoom = 0
+>>>>>>> 4e8b3979486122df89f015f2c767e06df233424f
 
 func reset():
 	basis = Basis()
@@ -64,5 +70,10 @@ func _process(delta):
 	if Input.is_action_pressed("cam_reset"):
 		reset()
 
+<<<<<<< HEAD
 	current_zoom = clamp(current_zoom, zoom_min, zoom_max)
 	$InnerGimbal/Camera3D.position = Vector3($InnerGimbal/Camera3D.position.x, current_zoom, current_zoom)
+=======
+	current_zoom = clamp(current_zoom,zoom_min,zoom_max)
+	$InnerGimbal/Camera3D.position = Vector3($InnerGimbal/Camera3D.position.x,current_zoom,current_zoom)
+>>>>>>> 4e8b3979486122df89f015f2c767e06df233424f