vs project file conflict resolved