conflicts dealt with