minor changes
resolved conflicts
example lazy firework