added bullets (click or tap to fire)
fixed conflicts