Revert "merge conflict database class"

This reverts commit f205041e6a0225075c6cbe17b12a5a013bc8d645.