working bullets
merge conflits