Added my review of the ADD
Resolved merge conflict