mkdb: fix issues from wrong rebase conflic handling