conflicts management