Conflicts: addons/ballistics/stringtable.xml
Changes to weapon and ammunition values.
The people responsible for merging changes to this component or answering potential questions.