Rebased master