master conflict