Fixed weapon shooting
Merge