merge version
merge version
Add weapon to character