Removed merge conflict in weapon