master conflict edit