diff --git a/js/tinyDOM.js b/js/tinyDOM.js
index 38c7cd084df0bd62eec776ca004f5be61f4e1159..0067b8ab7f9cdc13221063e2e4ab95c2becb8e1d 100644
--- a/js/tinyDOM.js
+++ b/js/tinyDOM.js
@@ -1,10 +1,5 @@
 /*global Element, CustomEvent, HTMLElement */
-<<<<<<< HEAD
-/*jslint plusplus: true */
-/*jslint nomen: true*/
-=======
 /*jslint plusplus: true, nomen: true*/
->>>>>>> origin/master
 
 (function () {
     'use strict';
@@ -195,7 +190,6 @@
         }
         return is;
     };
-<<<<<<< HEAD
 
     tinyDOM.isJson = function (obj) {
         try {
@@ -205,8 +199,6 @@
             return false;
         }
     };
-=======
->>>>>>> origin/master
 
 	tinyDOM.exists = function (obj) {
 		return obj !== null && typeof (obj) !== 'undefined';