fix: merge conflict

include/app.h

@@ -108,11 +108,8 @@ typedef struct {
   Animation animation;
   Physics physics;
   float rotation;
-<<<<<<< HEAD
   Sound soundFlapping;
-=======
   int health;
->>>>>>> origin/pirate
   int gold;
 } Player;
 
@@ -249,7 +246,7 @@ void UpdatePlayer(void);
 void RenderPlayer(void);
 
 Enemies CreateEnemies(void);
-void UpdateEnemies(Enemies *enemies, Projectiles *projectiles);
+void UpdateEnemies(Enemies *enemies);
 void RenderEnemies(Enemies *enemies);
 
 Birds CreateBirds(void);

include/engine.h

@@ -243,12 +243,7 @@ float Cross2D(Vector2 a, Vector2 b);
 Vector2 GetPositionInsideRectangle(Rectangle rec);
 Vector2 GetPositionOutsideRectangle(Rectangle rec, int min, int max);
 
-<<<<<<< HEAD
-bool SaveStorageValue(const char* fileName, unsigned int position, int value);
-int LoadStorageValue(const char* fileName, unsigned int position);
+bool SaveStorageValue(const char *fileName, unsigned int position, int value);
+int LoadStorageValue(const char *fileName, unsigned int position);
 
-#endif //ENGINE_H
-
-=======
 #endif // ENGINE_H
->>>>>>> origin/pirate