diff --git a/haimen.png b/haimen.png
new file mode 100644
index 0000000..8ba8781
--- /dev/null
+++ b/haimen.png
Binary files differ
diff --git a/sinkei.js b/sinkei.js
index c1d1459..d5164b9 100644
--- a/sinkei.js
+++ b/sinkei.js
@@ -1,8 +1,11 @@
-
 var cards = [];
 var startTime;
 var timer;
+<<<<<<< HEAD
 //var infobox =docment.getElementById("start")
+=======
+//var infobox =docment.getElementById("start");
+>>>>>>> a018a7ef19aa87692bfc545fb67d4e7a570e3300
 var backTimer;
 var flgFirst = true;
 var cardFirst;