Fixed eating weapon bug
Fixed merge conflict