diff --git a/data/scripts/main.js b/data/scripts/main.js
index c66c3d9b..caec05f2 100644
--- a/data/scripts/main.js
+++ b/data/scripts/main.js
@@ -30,6 +30,7 @@ function initiate() {
 	document.getElementById("displayCanvas").width = cardWidth;
 	document.getElementById("displayCanvas").height = cardHeight;
 	window.displayContext = displayCanvas.getContext("2d");
+<<<<<<< HEAD
 	newCanvas("frameMask");
 	newCanvas("frameFinal");
 	newCanvas("cardFinal");
@@ -38,6 +39,13 @@ function initiate() {
 	//initiation is complete, ready to load image data
 	console.log("init done");
 	loadImageCSV();
+=======
+	// loadScript("data/scripts/sortable.js");
+	import Sortable from "./sortable.js";
+    var el = document.getElementById('items');
+	// var sortable = Sortable.create(el);
+	console.log("init done")
+>>>>>>> 14a4104f200c050a672892cadd01502c7e047d63
 }