fixed weird text added in

src/collision.c

@@ -2,10 +2,7 @@
 #include <math.h>
 #include "config.h"
 #include "collision.h"
-<<<<<<< HEAD
 #include "player.h"
-=======
->>>>>>> dff3a5d2c4b8cd3d6d86ab9792e394cd0d27a619
 
 void checkCollision(){
     float playerx=0.0;
@@ -24,7 +21,6 @@ void checkCollision(){
             if(playerx-(plrsize/2)<objposx+(objsize/2) && playerx-(plrsize/2)>objposx-(objsize/2)){
                 ApplyForce(
                     e,
-<<<<<<< HEAD
                     (Vector2){10000, 1000}
                 );
                 if(dir){
@@ -39,14 +35,6 @@ void checkCollision(){
                     (Vector2){-(curhorvel*3), 1000}
                 );
                 }
-=======
-                    (Vector2){1000, 1000}
-                );
-                ApplyForce(
-                    player,
-                    (Vector2){-1000, 1000}
-                );
->>>>>>> dff3a5d2c4b8cd3d6d86ab9792e394cd0d27a619
             }
         }
         else{