I've rebased. Perhaps you merge now? :trollface: