my exploding stuff
merge conflict