update weapons
merge conflicts