diff --git a/docs/en-US/upload-existing-volume-to-vm.xml b/docs/en-US/upload-existing-volume-to-vm.xml
index 2f58a97423e..3cbfc343125 100644
--- a/docs/en-US/upload-existing-volume-to-vm.xml
+++ b/docs/en-US/upload-existing-volume-to-vm.xml
@@ -109,5 +109,4 @@
         Volumes, find the name you specified in step 5, and make sure the status is Uploaded.</para>
     </listitem>
   </orderedlist>
->>>>>>> a12a13c... CLOUDSTACK-3300: little fix for doc build
 </section>