bullets
fixed merge conflicts