fixed weapons
merge