do not use OBRMAN in conflict manager tests
Merge branch 'master' of https://github.com/AdeleResearchGroup/ApAM