fixing some stuff on bullets and guns
fixed merge conflicts