(#1000) - if no conflicts then _conflicts should not be present

This commit adds a simple test for that and moves the common changes logic into the generic adapter.