diff --git a/game/src/Map.cpp b/game/src/Map.cpp
index bf568e7..e235046 100644
--- a/game/src/Map.cpp
+++ b/game/src/Map.cpp
@@ -1,4 +1,4 @@
-#include "Map.hpp"
+#include <include/Map.hpp>
 
 Map::Map(const uint16_t &id, const uint8_t &currentType, const std::string &mapName, const std::string &bitmapName, const tileArray &tiles, const uint16_t &dimensionX, const uint16_t &dimensionY, const entityMap &entities) {
     setId(id);
diff --git a/include/Map.hpp b/include/Map.hpp
index c849ec0..074b6dc 100644
--- a/include/Map.hpp
+++ b/include/Map.hpp
@@ -1,17 +1,13 @@
 #pragma once
 
-#include "Tile.hpp"
+#include <include/Tile.hpp>
 
 #include <iostream>
 #include <string>
 #include <vector>
 
 using tileArray = boost::multi_array<Tile,2>;
-<<<<<<< HEAD
 using entityMap = std::map<uint32_t,entity::Entity>;
-=======
-using entityStdMap = std::map<uint32_t,entity::Entity>;
->>>>>>> 27e3747 (Refactor .h -> .hpp and correct typos)
 
 class Map {
     private:
@@ -20,20 +16,12 @@ class Map {
         std::string mapName_;
         std::string bitmapName_;
         tileArray tiles_;
-<<<<<<< HEAD
         entityMap entities_;
-=======
-        entityStdMap entities_;
->>>>>>> 27e3747 (Refactor .h -> .hpp and correct typos)
 
     public:
 
         Map();
-<<<<<<< HEAD
         Map(const uint16_t &id, const uint8_t &currentType, const std::string &mapName, const std::string &bitmapName, const tileArray &tiles, const uint16_t &dimensionX, const uint16_t &dimensionY, const entityMap &entities);
-=======
-        Map(const uint16_t &id, const uint8_t &currentType, const std::string &mapName, const std::string &bitmapName, const tileArray &tiles, const uint16_t &dimensionX, const uint16_t &dimensionY, const entityStdMap &entities);
->>>>>>> 27e3747 (Refactor .h -> .hpp and correct typos)
         ~Map();
 
         void setId(const uint16_t &id);
@@ -41,11 +29,7 @@ class Map {
         void setMapName(const std::string &mapName);
         void setBitmapName(const std::string &bitmapName);
         void setTiles(const tileArray tiles, const uint16_t &dimensionX, const uint16_t &dimensionY);
-<<<<<<< HEAD
         void setEntities(const entityMap &entities);
-=======
-        void setEntities(const entityStdMap &entities);
->>>>>>> 27e3747 (Refactor .h -> .hpp and correct typos)
         void setTile(const utils::Coordinate &coordinate, const Tile &tile);
 
         const uint16_t getId();
@@ -53,11 +37,7 @@ class Map {
         const std::string getMapName();
         const std::string getBitmapName();
         const tileArray getTiles();
-<<<<<<< HEAD
         const entityMap getEntities();
-=======
-        const entityStdMap getEntities();
->>>>>>> 27e3747 (Refactor .h -> .hpp and correct typos)
 
         void swapTiles(Tile tile1, Tile Tile2);
 
diff --git a/test/MapTest.cpp b/test/MapTest.cpp
index aa4b9f2..de8151e 100644
--- a/test/MapTest.cpp
+++ b/test/MapTest.cpp
@@ -1,4 +1,4 @@
-#include "Map.hpp"
+#include <include/Map.hpp>
 
 int main() {
     std::cout<<"hello Map"<<std::endl;