fixed couple of wrong merge selections during rebase with release-4.6