sombrero
fixed double bullets
damaged sombreros
lots of conflicts