settle conflicts