sdm - master conflict resolution