DevelopmentServerPort merge conflict

I have a team of people working on a Visual Studio (C#) project, and we keep running into this problem where there is a merge conflict in the project file on the DevelopmentServerPort. Apparently the DevelopmentServerPort is saved in the project file, rather than in user settings.

Is there any way to solve this, other than forcing it to a specific port? That won't work because we have multiple devs developing on terminal servers, and they can'开发者_StackOverflow社区t all use the same port.

Under the project properties for the web project, uncheck "Apply server setting to all users (store in project file)". This makes it a per-user setting.