fix comment text
resolve conflict