small tune-up in conflict dialog