styles circles more
styled circles
resolved conflicts