diff --git a/src/empty_space_thing.gd b/src/empty_space_thing.gd
index 32451fc..6b6fab2 100644
--- a/src/empty_space_thing.gd
+++ b/src/empty_space_thing.gd
@@ -31,12 +31,7 @@ func _process(delta: float) -> void:
 			time_since_first_location = 0
 		
 		if Input.is_action_pressed("click"):
-<<<<<<< Updated upstream
 			mouse_first_location = get_global_mouse_position()
-=======
-			# If
-			time_since_first_location += delta
->>>>>>> Stashed changes
 		
 		elif Input.is_action_just_released("click"):
 			time_since_first_location += delta