Update skill_unit_db.txt

resolved merge conflicts in skill_unit_db.txt