very bad collision(work in progress)

src/player.c

@@ -7,7 +7,10 @@
 
 // let's a go!
 float curhorvel=0.0f; //current horizonatal velocity
+<<<<<<< HEAD
 bool dir=0;
+=======
+>>>>>>> dff3a5d2c4b8cd3d6d86ab9792e394cd0d27a619
 void UpdatePlayerControls(void)
 {
     // if there isn't a player, you probably can't do much
@@ -20,7 +23,10 @@ void UpdatePlayerControls(void)
     // if a key pressed, push player to the left
     if (IsKeyDown(KEY_A))
     {
+<<<<<<< HEAD
         dir=1;
+=======
+>>>>>>> dff3a5d2c4b8cd3d6d86ab9792e394cd0d27a619
         if(curhorvel<MAX_PLAYER_SPEED){
             curhorvel=curhorvel*PLAYER_SPEED_FACTOR;
         }
@@ -32,7 +38,10 @@ void UpdatePlayerControls(void)
     // if d key pressed, push player to the right
     else if (IsKeyDown(KEY_D))
     {
+<<<<<<< HEAD
         dir=0;
+=======
+>>>>>>> dff3a5d2c4b8cd3d6d86ab9792e394cd0d27a619
         if(curhorvel<=MAX_PLAYER_SPEED){
             curhorvel=curhorvel*PLAYER_SPEED_FACTOR;
         }