Added an oval
Resolved merge conflicts 2