Added a comment
Resolved merge conflict