added shoot
fixed merge