added bullet spit
update merge conflict