I am working on a project with another developer, the app is not on the App Store yet. We are getting Git merge conflicts because our accounts are not on the same development team. I tried adding the developer to the team in the developer portal but it only allows that for apps that are live in the store. How can we work on the same project without git conflicts?