Modified README to create a merge conflict once repo is pulled from partner