Resolve conflict.

Author: peombwa

tools/Templates/Microsoft.Graph.nuspec

@@ -2,11 +2,7 @@
 <package>
   <metadata>
     <id>Microsoft.Graph</id>
-<<<<<<< HEAD
     <version>0.7.1</version>
-=======
-    <version>0.9.0</version>
->>>>>>> dev
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <licenseUrl>https://aka.ms/devservicesagreement</licenseUrl>

tools/Templates/readme.md

@@ -14,10 +14,6 @@ subject-prefix: ''
 ### Versioning
 
 ``` yaml
-<<<<<<< HEAD
 module-version: 0.7.1
-=======
-module-version: 0.9.0
->>>>>>> dev
 release-notes: See https://aka.ms/GraphPowerShell-Release.
 ```