can handle divergences between upstream master and flab master