Update mob_skill_db.txt

resolved merge conflicts in mob_skill_db.txt