Resolve conflicts

Assets/Config/CarouselData.asset

Assets/Config/CleaningBuildingData.asset

Assets/Config/EntranceData.asset

Assets/Config/FerrisWheelData.asset

Assets/Config/GameConfig.asset

Assets/Config/MaintenanceBuildingData.asset

Assets/Config/PavementData.asset

Assets/Config/QueuePavementData.asset

Assets/Config/RestaurantData.asset

Assets/Model/Cartography/MapObject.cs

Assets/Model/Cartography/Vec2i.cs

Assets/Model/Common/IBuilder.cs

Assets/Model/Common/IDisplayable.cs

Assets/Model/Common/ITickable.cs

Assets/Model/Common/MaintenanceDispacher.cs

Assets/Model/Common/ModelObjectHandle.cs

Assets/Model/Common/Park.cs

Assets/Model/Common/Simulation.cs

Assets/Model/Common/TickResult.cs

Assets/Model/Common/WorldEntity.cs