Manually resolve Conflicts: conf/msg_conf/map_msg.conf db/packet_db.txt src/common/mmo.h src/map/pc.c src/map/pc.h