fix incorrect merge on jabbrcontext during rebase