Started commenting weapons.conf
Fixed a broken merge