circle goes on
conflict fix