a crazy soap bubble
merge fix