Cross posting from Ads forum: The UnityConnectSettings file is causing merge conflicts with Collaborate feature. I develop for UWP & Android on PC and iPhone on a Mac. This particular file has to be different for Android vs iPhone, because of the m_GameId field. Why even have it? You already have the separate ones for Android and iPhone in the same file? I don't want to have to manually merge this file every time.