1 files changed, 7 insertions, 2 deletions
diff --git a/include/entities.h b/include/entities.h
index 2a9a62b..fc2f35c 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -54,7 +54,7 @@ public:
 private:
 };
 
-class Player : public Entity{
+class Player : public Entity {
 public:
 	QuestHandler qh;
 	Player();
@@ -97,5 +97,10 @@ ENTITY TYPES
 |->1 Merchant
 |
 2 MOBS
+<<<<<<< HEAD
 |->1 Rabbit
-**/
-\ No newline at end of file
+**/
+=======
+|->1 Skirl
+**/
+>>>>>>> 58716d5e4f20eb5a30025c88fe5119a0e40c4187