Fix conflict in Shooter