Search: conflicts changes

conflicts comment   conflicts english   conflicts field   conflicts however   conflicts large