diff --git a/cps/epub.py b/cps/epub.py
index 368eadf5..446efe9b 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -41,14 +41,6 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
     p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0]
 
     epub_metadata = {}
-<<<<<<< HEAD
-    try:#maybe description isn't present
-        comments = tree.xpath("//*[local-name() = 'description']/text()")[0]
-        epub_metadata['comments'] = comments
-    except IndexError as e:
-        epub_metadata['comments'] = ""
-=======
->>>>>>> master
 
     for s in ['title', 'description', 'creator', 'language']:
         tmp = p.xpath('dc:%s/text()' % s, namespaces=ns)
@@ -74,11 +66,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
             epub_metadata['language'] = isoLanguages.get(part3=lang).name
         else:
             epub_metadata['language'] = ""
-<<<<<<< HEAD
-    
-=======
 
->>>>>>> master
     coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
     coverfile = None
     if len(coversection) > 0:
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 86b7281e..f3425995 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -150,9 +150,7 @@
 </script>
 <script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
-<<<<<<< HEAD
 <script src="{{ url_for('static', filename='js/libs/bootstrap-rating-input.min.js') }}"></script>
-=======
 <script src="{{ url_for('static', filename='js/get_meta.js') }}"></script>
 {% endblock %}
 {% block header %}