Displays selected comment and added edit controls
Resolved merge conflicts