Fix merge conflict

src/Workspaces/Core/Portable/Workspace/Solution/RecoverableTextAndVersion.cs

@@ -57,9 +57,6 @@ public override bool TryGetValue(out TextAndVersion value)
 
         public bool TryGetTextVersion(out VersionStamp version)
         {
-<<<<<<< HEAD
-            version = _version;
-=======
             version = _storedVersion;
 
             // if the TextAndVersion has not been stored yet, but it has been observed
@@ -73,7 +70,6 @@ <<<<<<< HEAD
                 }
             }
 
->>>>>>> upstream/master
             return version != default(VersionStamp);
         }