diff --git a/Ball.cpp b/Ball.cpp
index 1494091..fb6395c 100644
--- a/Ball.cpp
+++ b/Ball.cpp
@@ -92,7 +92,6 @@ void Ball::update_pos(double dt) {
         double old_t = T;
         double max_t;
         _compute_parameters();
->>>>>>> Utility function
         max_t = (T - old_t)/2.0 + old_t;
 
         if (((A + B * max_t - (G_CTE / 2) * max_t * max_t + min_height) < radius)) {