* adjust conflict.