exploding bubbles
fix conflicts