team page resolve conflict