Merging WeaponSystem with Master