fixed comments edit issue
resolved conflict