Fix bad rebasing conflict resolution. We need to pass the authdb here
Merge Pull Request #328 into 'next'

* pr/328:
  Fix bad rebasing conflict resolution. We need to pass the authdb here