Changes to force master branch resolution