added shooting
fixed merge conflict