Manage conflict situations