Conflict Fixing

getWeapon() back in