Drew a circle
Resolved merge conflicts