Implemented clear all
Resolved merge conflict