Merging

remote: Counting objects: 8236, done.
remote: Compressing objects: 100% (61/61), done.
remote: Total 8236 (delta 3087), reused 3074 (delta 3074), pack-reused 5101
Receiving objects: 100% (8236/8236), 4.05 MiB | 2.49 MiB/s, done.
Resolving deltas: 100% (6315/6315), completed with 1563 local objects.
From https://github.com/Rochet2/TrinityCore
 * branch            objscale   -> FETCH_HEAD
Removing src/tools/mmaps_generator/VMapExtensions.cpp
Auto-merging src/server/worldserver/worldserver.conf.dist
Auto-merging src/server/worldserver/Main.cpp
Auto-merging src/server/worldserver/CMakeLists.txt
Auto-merging src/server/shared/DataStores/DBCStore.h
Removing src/server/scripts/World/npc_taxi.cpp
Removing src/server/scripts/World/CMakeLists.txt
Removing src/server/scripts/Spells/CMakeLists.txt
Removing src/server/scripts/Pet/CMakeLists.txt
Removing src/server/scripts/Outland/CMakeLists.txt
Removing src/server/scripts/OutdoorPvP/CMakeLists.txt
Removing src/server/scripts/Northrend/CMakeLists.txt
Removing src/server/scripts/Kalimdor/CMakeLists.txt
Removing src/server/scripts/Events/CMakeLists.txt
Removing src/server/scripts/EasternKingdoms/CMakeLists.txt
Removing src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
Removing src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
Removing src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
Removing src/server/scripts/Custom/CMakeLists.txt
Auto-merging src/server/scripts/Commands/cs_reload.cpp
Removing src/server/scripts/Commands/CMakeLists.txt
Auto-merging src/server/scripts/CMakeLists.txt
Auto-merging src/server/game/World/World.cpp
Auto-merging src/server/game/Spells/Auras/SpellAuraEffects.cpp
Auto-merging src/server/game/Server/WorldSocket.cpp
Auto-merging src/server/game/Server/WorldSession.cpp
Auto-merging src/server/game/Scripting/ScriptMgr.cpp
CONFLICT (content): Merge conflict in src/server/game/Scripting/ScriptMgr.cpp
Auto-merging src/server/game/Miscellaneous/SharedDefines.h
Auto-merging src/server/game/Maps/MapManager.cpp
Auto-merging src/server/game/Maps/Map.cpp
CONFLICT (content): Merge conflict in src/server/game/Maps/Map.cpp
Auto-merging src/server/game/Handlers/SpellHandler.cpp
Auto-merging src/server/game/Handlers/QuestHandler.cpp
Auto-merging src/server/game/Handlers/QueryHandler.cpp
Auto-merging src/server/game/Handlers/MiscHandler.cpp
Auto-merging src/server/game/Handlers/LootHandler.cpp
Auto-merging src/server/game/Handlers/ChatHandler.cpp
Auto-merging src/server/game/Handlers/CharacterHandler.cpp
Auto-merging src/server/game/Guilds/Guild.h
Auto-merging src/server/game/Globals/ObjectMgr.h
Auto-merging src/server/game/Globals/ObjectMgr.cpp
Auto-merging src/server/game/Entities/Unit/Unit.cpp
CONFLICT (content): Merge conflict in src/server/game/Entities/Unit/Unit.cpp
Auto-merging src/server/game/Entities/Player/Player.cpp
Auto-merging src/server/game/Entities/Object/Object.h
Auto-merging src/server/game/Entities/Object/Object.cpp
Auto-merging src/server/game/Entities/GameObject/GameObject.cpp
Auto-merging src/server/game/Entities/Creature/Creature.h
CONFLICT (content): Merge conflict in src/server/game/Entities/Creature/Creature.h
Auto-merging src/server/game/Entities/Creature/Creature.cpp
Auto-merging src/server/game/Chat/Chat.cpp
Auto-merging src/server/game/CMakeLists.txt
Auto-merging src/server/game/AI/SmartScripts/SmartScript.cpp
Auto-merging src/server/database/Database/QueryResult.h
Auto-merging src/server/database/Database/Field.h
Auto-merging src/common/Utilities/Containers.h
Auto-merging src/CMakeLists.txt
Auto-merging dep/CMakeLists.txt
Auto-merging cmake/showoptions.cmake
Auto-merging cmake/options.cmake
Auto-merging .travis.yml
Automatic merge failed; fix conflicts and then commit the result.