conflict adjustment