diff --git a/lib/Element.ts b/lib/Element.ts
index f0502e6..9c625d3 100644
--- a/lib/Element.ts
+++ b/lib/Element.ts
@@ -25,13 +25,6 @@ export class Element {
   }
 
   public constructor (name: string, parent = '') {
-<<<<<<< HEAD
-=======
-    const regex = /^[a-z_][a-z_0-9]+$/iu;
-
-    if (!regex.test (name))
-      throw new Error ('invalid name specified');
->>>>>>> f553396eee29e1e0820624345e5d23dc3471a4a4
     this.name = name;
     this.parent_name = parent;
   }
diff --git a/test/Node.ts b/test/Node.ts
index 18a447d..486bee6 100644
--- a/test/Node.ts
+++ b/test/Node.ts
@@ -59,12 +59,7 @@ test ('adhere to naming convention', (t) => {
 
 test ('throw on invalid name', (t) => {
   t.throws (() => {
-<<<<<<< HEAD
     const n = new Node ('564#+-.,/@', 'parent');
-=======
-    const n = new Node ('invalid.name', 'parent');
-
->>>>>>> f553396eee29e1e0820624345e5d23dc3471a4a4
     return n.toString ();
   }, { message: 'invalid name specified' });
 });