Fix tutorial

tutorials/nnvm/deploy_ssd.py

@@ -4,12 +4,7 @@
 **Author**: `Yao Wang <https://github.com/kevinthesun>`_
 
 This article is an introductory tutorial to deploy SSD models with TVM.
-<<<<<<< HEAD
-We will use mxnet pretrained SSD model with Resnet50 as body network and
-convert it to NNVM graph;
-=======
 We will use GluonCV pre-trained SSD model and convert it to NNVM graph.
->>>>>>> Modify SSD tutorial
 """
 import tvm