Fix bad rebasing conflict resolution. We need to pass the authdb here