Add Segment
Add solidity to circles
Resolve conflicts