set comment string
resolve conflict