more verbose error message for outdated database version
resolved merge conflict