This should be clarified. Once you rebase off latest master this will be a merge conflict you need to resolve.