diff --git a/netslicehandler/template/nst_list.html b/netslicehandler/template/nst_list.html
index dadde87..a2e4f4a 100644
--- a/netslicehandler/template/nst_list.html
+++ b/netslicehandler/template/nst_list.html
@@ -149,13 +149,10 @@
                 {
                     "render": function (data, type, row) {
                         return '<div class="btn-group">' +
-<<<<<<< Updated upstream
                             '   <button type="button" class="btn btn-default" data-container="body"\n' +
-                               'data-toggle="tooltip" data-placement="top" title="Instantiate NS"\n' +
-                               'onclick="javascript:openModalCreateNSI({\'template_name\':\''+row["name"]+'\', \'template_id\':\''+row["_id"]+'\', \'project_id\':\'{{ project_id }}\',\'vim_list_url\': \'{% url "vims:list"  %}\', \'nst_list_url\': \'{% url "netslices:list_templates" %}\'})">\n' +
-                               '<i class="fa fa-paper-plane"></i></button>\n'+
-=======
->>>>>>> Stashed changes
+                            '   data-toggle="tooltip" data-placement="top" title="Instantiate NS"\n' +
+                            '   onclick="javascript:openModalCreateNSI({\'template_name\':\''+row["name"]+'\', \'template_id\':\''+row["_id"]+'\', \'project_id\':\'{{ project_id }}\',\'vim_list_url\': \'{% url "vims:list"  %}\', \'nst_list_url\': \'{% url "netslices:list_templates" %}\'})">\n' +
+                            '   <i class="fa fa-paper-plane"></i></button>\n'+
                             '     <button type="button" class="btn btn-default"' +
                             '             onclick="javascript:showNstDetails(\'' + row["_id"] + '\')"' +
                             '             data-toggle="tooltip" data-placement="top" data-container="body" title="Open">' +
@@ -217,4 +214,4 @@
     }
 </script>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}