How To Resolve Conflicts In Visual Studio