Added to edit comment path
resolved merge conflict