merge conflict database class