manage conflict