Conflict resolution

diff --cc boilerplate.html
index 8502645,15a9950..88e5502
--- 1/boilerplate.html
--- 2/boilerplate.html
+++ b/boilerplate.html
@@@ -77,7 -81,7 +77,6 @@@
  <script src="core/deck.core.js"></script>
  
  <!-- Extension JS files. Add or remove as needed. -->
- <script src="core/deck.core.js"></script>
 -<script src="extensions/hash/deck.hash.js"></script>
  <script src="extensions/menu/deck.menu.js"></script>
  <script src="extensions/goto/deck.goto.js"></script>
  <script src="extensions/status/deck.status.js"></script>