diff --git a/lives/2020-11-10/day.yml b/lives/2020-11-10/day.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b38f00cb1aae71afe8555891328887e6dbb76010
--- /dev/null
+++ b/lives/2020-11-10/day.yml
@@ -0,0 +1,98 @@
+<<<<<<< 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 直播'
+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'
+relations:
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+>>>>>>> 8f397bd635b25fc8480d7a56ba92281707154291:lives/2020-11-10/day.yml
diff --git a/lives/2020-11-11/day.yml b/lives/2020-11-11/day.yml
index 4dcbdb26bdfd3ae23577b5ef8e5268ca0a3f76f6..45c5cc150473c0241da746d0a2df056c2a38164f 100644
--- a/lives/2020-11-11/day.yml
+++ b/lives/2020-11-11/day.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 日期时间戳标志
 timestamp: '2020-11-11'
 title: 'python直播'
@@ -44,3 +45,47 @@ items:
       link: 'https://www.baidu.com'
 
       
+=======
+# 日期时间戳标志
+timestamp: '2020-11-11'
+title: 'XXX 直播'
+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'
+relations:
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+
+
+>>>>>>> 8f397bd635b25fc8480d7a56ba92281707154291
diff --git a/lives/2020-11-12/day.yml b/lives/2020-11-12/day.yml
index 1aea633e68ee696e8291137be883543cc6871448..328827cfbece73bdabe599ff69017e8f188e448e 100644
--- a/lives/2020-11-12/day.yml
+++ b/lives/2020-11-12/day.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 日期时间戳标志
 timestamp: '2020-11-12'
 title: 'ruby直播'
@@ -48,3 +49,47 @@ relations:
     title: 'python直播'
 
     
+=======
+# 日期时间戳标志
+timestamp: '2020-11-12'
+title: 'XXX 直播'
+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'
+relations:
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+
+
+>>>>>>> 8f397bd635b25fc8480d7a56ba92281707154291
diff --git a/lives/2020-11-13/day.yml b/lives/2020-11-13/day.yml
index c3f9880156535a57c603b449ecae92f83a20e743..655765da79a883fd6905417badc4b58a7c67a2e3 100644
--- a/lives/2020-11-13/day.yml
+++ b/lives/2020-11-13/day.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 日期时间戳标志
 timestamp: '2020-11-13'
 title: 'java直播'
@@ -50,3 +51,47 @@ relations:
     timestamp: '2020-11-11'
     title: 'python直播'
     
+=======
+# 日期时间戳标志
+timestamp: '2020-11-13'
+title: 'XXX 直播'
+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'
+relations:
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+
+
+>>>>>>> 8f397bd635b25fc8480d7a56ba92281707154291
diff --git a/lives/2020-11-14/day.yml b/lives/2020-11-14/day.yml
index c118621beeb8086a55fead3fe796552f87d83bb2..b38f00cb1aae71afe8555891328887e6dbb76010 100644
--- a/lives/2020-11-14/day.yml
+++ b/lives/2020-11-14/day.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:lives/2020-11-14/day.yml
 # 日期时间戳标志
 timestamp: '2020-11-14'
 title: '人工智能live'
@@ -53,3 +54,45 @@ relations:
     timestamp: '2020-11-11'
     title: 'python直播'
 
+=======
+# 日期时间戳标志
+timestamp: '2020-11-10'
+title: 'XXX 直播'
+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'
+relations:
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+  - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+    link: ''
+>>>>>>> 8f397bd635b25fc8480d7a56ba92281707154291:lives/2020-11-10/day.yml
diff --git a/lives/index.yml b/lives/index.yml
index 306573afa589827a11dd7edb2f848447c4b0a7e6..4855bc60365783827cbcb4d4d2f87f16d780b6f6 100644
--- a/lives/index.yml
+++ b/lives/index.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 banner: 
   mobile_url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
   pc_url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
@@ -6,3 +7,16 @@ banner:
 current: '2020-11-14'
 # 描述 富文本
 description: "<div><span>直播</span> 第15届中国Linux 内核开发者大会</div>"
+=======
+banner: 
+  mobile:
+    - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+      link: 'https://www.baidu.com/'
+  pc: 
+    - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/700cd15fa181e0582638135e4c1954b3/banner.jpg'
+      link: 'https://www.baidu.com/'
+    # 日期时间戳标志
+current: '2020-11-10'
+# 描述 富文本
+description: "<div><span>直播</span> 第15届中国Linux 内核开发者大会</div>"
+>>>>>>> 8f397bd635b25fc8480d7a56ba92281707154291