comment modified to 3
conflict resolved comment 3