fix comments issue
merging