comment modified for conflict