Fix Branches

The previous merge was accidentally done the wrong way.