diff --git a/themes/nurgul/layouts/main.htm b/themes/nurgul/layouts/main.htm
index a7546ae..8fe8e16 100755
--- a/themes/nurgul/layouts/main.htm
+++ b/themes/nurgul/layouts/main.htm
@@ -81,14 +81,9 @@ function onStart(){
     <!-- Main JS -->
     <script src="{{'assets/js/main.js'|theme}}"></script>
 
-   {% partial 'scripts/addToCart' token=nurgulToken %}
+
     {% framework extras %}
 
-<<<<<<< HEAD
-=======
- 
-
->>>>>>> bb1deb8be8e81c0183888653d87cdcb79e6f3984
     {% scripts %}
 
 </body>