conflict master