Added an oval
Added a line to the graphic
Resolved merge conflicts
Resolved merge conflicts