[Feature] add for new

Author: houbb

index.html

@@ -140,18 +140,14 @@ <h1>算法可视化 · 资源导航</h1>
 
   <div class="grid" id="cardGrid">
     <!-- 示例卡片 -->
-<<<<<<< HEAD
-	
 	<div class="card" data-tags="binary-tree 二叉树 前序 中序 后序 层序">
       <div class="card-title">binary-tree-travel 二叉树遍历</div>
       <div class="card-desc">binary-tree-travel 前序、中序、后序、层序遍历</div>
       <a href="./binary-tree-travel.html" target="_blank">打开页面</a>
-=======
 	<div class="card" data-tags="linkedlist two-pointer 双指针 T160相交链表 intersection-of-two-linked-lists">
       <div class="card-title">T160 相交链表 intersection-of-two-linked-lists</div>
       <div class="card-desc">双指针解法</div>
       <a href="./T160_linkedlist-two-pointer.html" target="_blank">打开页面</a>
->>>>>>> 960a8ccda8d2e38666a58bf945a8328fe6cbb2f2
     </div>
 
 	<div class="card" data-tags="difference-array array 差分数组 数组">