got rid of extra trigger ;shooterCloseGetShot041' also fixed merge conflicts