diff --git a/src/tree/convert-sorted-array-to-binary-search-tree.js b/src/tree/convert-sorted-array-to-binary-search-tree.js
index 7cc141b..af258b4 100644
--- a/src/tree/convert-sorted-array-to-binary-search-tree.js
+++ b/src/tree/convert-sorted-array-to-binary-search-tree.js
@@ -1,15 +1,5 @@
-<<<<<<< HEAD
 import TreeNode from '../../test/tree/TreeNode'
-=======
-/**
- * Definition for a binary tree node.
- */
-function TreeNode(val) {
-  this.val = val
-  this.left = this.right = null
-}
 
->>>>>>> 450f1f6b5d96df43627b7b8c07518b2ec772a2da
 /**
  * @param {number[]} nums
  * @return {TreeNode}