diff --git a/lives/2020-11-14/day.yml b/lives/2020-11-14/day.yml
index b38f00cb1aae71afe8555891328887e6dbb76010..2f4bcb12047ffa1b86b223806fd9723f73bbb312 100644
--- a/lives/2020-11-14/day.yml
+++ b/lives/2020-11-14/day.yml
@@ -1,63 +1,6 @@
-<<<<<<< HEAD:lives/2020-11-14/day.yml
-# 日期时间戳标志
-timestamp: '2020-11-14'
-title: '人工智能live'
-items:
-# 数组需要根据 start point 排序
-  - start_time: '20:00'
-    end_time: '20:30'
-    title: 'apache live'
-    # 有namespace path 的表示需要链接站内资源
-    namespace_path: 'codechina'
-    description: 'description for apache live'
-    # 可以根据 live link 进行查重、删除、更新
-    live_link: 'https://www.baidu.com'
-    supporters:
-    - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
-      link: 'https://www.baidu.com'
-  - start_time: '21:00'
-    end_time: '22:30'
-    title: 'apache live'
-    namespace_path: 'codechina'
-    description: 'description for apache live'
-    live_link: 'https://www.baidu.com'
-    supporters:
-    - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
-      link: 'https://www.baidu.com'
-  - start_time: '23:00'
-    end_time: '01:30'
-    title: 'apache live'
-    description: 'description for apache live'
-    live_link: 'https://www.baidu.com'
-    supporters:
-    - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
-      link: 'https://www.baidu.com'
-  - start_time: '20:00'
-    end_time: '20:30'
-    title: 'apache live'
-    # 有namespace path 的表示需要链接站内资源
-    namespace_path: 'maple_area'
-    description: 'description for apache live'
-    # 可以根据 live link 进行查重、删除、更新
-    live_link: 'https://www.baidu.com'
-    supporters:
-    - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
-      link: 'https://www.baidu.com'
-relations:
-  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
-    timestamp: '2020-11-13'
-    title: 'java直播'
-  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
-    timestamp: '2020-11-12'
-    title: 'ruby直播'
-  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
-    timestamp: '2020-11-11'
-    title: 'python直播'
-
-=======
 # 日期时间戳标志
-timestamp: '2020-11-10'
-title: 'XXX 直播'
+timestamp: '2020-11-14'
+title: '人工智能live'
 items:
 # 数组需要根据 start point 排序
   - start_time: '20:00'
@@ -71,14 +14,14 @@ items:
     supporters:
     - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
       link: 'https://www.baidu.com'
-  - start_time: '21:00'
-    end_time: '22:30'
-    title: 'apache live'
+  - start_time: '20:30'
+    end_time: '21:00'
+    title: 'python live'
     namespace_path: 'codechina'
     description: 'description for apache live'
     live_link: 'https://www.baidu.com'
     supporters:
-    - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    - url: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3537940327,1345893587&fm=26&gp=0.jpg'
       link: 'https://www.baidu.com'
   - start_time: '23:00'
     end_time: '01:30'
@@ -88,11 +31,24 @@ items:
     supporters:
     - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
       link: 'https://www.baidu.com'
+  - start_time: '20:00'
+    end_time: '20:30'
+    title: 'apache live'
+    # 有namespace path 的表示需要链接站内资源
+    namespace_path: 'maple_area'
+    description: 'description for apache live'
+    # 可以根据 live link 进行查重、删除、更新
+    live_link: 'https://www.baidu.com'
+    supporters:
+    - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+      link: 'https://www.baidu.com'
 relations:
   - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
-    link: ''
+    timestamp: '2020-11-13'
+    title: 'java直播'
   - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
-    link: ''
+    timestamp: '2020-11-12'
+    title: 'ruby直播'
   - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
-    link: ''
->>>>>>> 8f397bd635b25fc8480d7a56ba92281707154291:lives/2020-11-10/day.yml
+    timestamp: '2020-11-11'
+    title: 'python直播'