diff --git a/src/static/imageBackground.js b/src/static/imageBackground.js
index a482fb8..196b21e 100644
--- a/src/static/imageBackground.js
+++ b/src/static/imageBackground.js
@@ -50,7 +50,6 @@ import paidui_6 from '../assets/images/generate/template/paidui/paidui_6.webp'
 const imageBackground = [
     {
         id: 1,
-<<<<<<< HEAD
         titleImgUrl: shenxian_bg,
         children: [
             {
@@ -60,31 +59,26 @@ const imageBackground = [
             },
             {
                 id: 2,
-<<<<<<< HEAD
                 imgUrl: shenxian_2,
                 peopleCount: 2
             },
             {
                 id: 3,
-<<<<<<< HEAD
                 imgUrl: shenxian_3,
                 peopleCount: 2
             },
             {
                 id: 4,
-<<<<<<< HEAD
                 imgUrl: shenxian_4,
                 peopleCount: 3
             },
             {
                 id: 5,
-<<<<<<< HEAD
                 imgUrl: shenxian_5,
                 peopleCount: 4
             },
             {
                 id: 6,
-<<<<<<< HEAD
                 imgUrl: shenxian_6,
                 peopleCount: 5
             }
@@ -92,7 +86,6 @@ const imageBackground = [
     },
     {
         id: 2,
-<<<<<<< HEAD
         titleImgUrl: xianxia_bg,
         children: [
             {
@@ -102,31 +95,26 @@ const imageBackground = [
             },
             {
                 id: 2,
-<<<<<<< HEAD
                 imgUrl: xianxia_2,
                 peopleCount: 2
             },
             {
                 id: 3,
-<<<<<<< HEAD
                 imgUrl: xianxia_3,
                 peopleCount: 3
             },
             {
                 id: 4,
-<<<<<<< HEAD
                 imgUrl: xianxia_4,
                 peopleCount: 3
             },
             {
                 id: 5,
-<<<<<<< HEAD
                 imgUrl: xianxia_5,
                 peopleCount: 4
             },
             {
                 id: 6,
-<<<<<<< HEAD
                 imgUrl: xianxia_6,
                 peopleCount: 5
             }
@@ -134,7 +122,6 @@ const imageBackground = [
     },
     {
         id: 3,
-<<<<<<< HEAD
         titleImgUrl: fugu_bg,
         children: [
             {
@@ -144,31 +131,26 @@ const imageBackground = [
             },
             {
                 id: 2,
-<<<<<<< HEAD
                 imgUrl: fugu_2,
                 peopleCount: 2
             },
             {
                 id: 3,
-<<<<<<< HEAD
                 imgUrl: fugu_3,
                 peopleCount: 2
             },
             {
                 id: 4,
-<<<<<<< HEAD
                 imgUrl: fugu_4,
                 peopleCount: 3
             },
             {
                 id: 5,
-<<<<<<< HEAD
                 imgUrl: fugu_5,
                 peopleCount: 4
             },
             {
                 id: 6,
-<<<<<<< HEAD
                 imgUrl: fugu_6,
                 peopleCount: 5
             }
@@ -176,7 +158,6 @@ const imageBackground = [
     },
     {
         id: 4,
-<<<<<<< HEAD
         titleImgUrl: xinzhongshi_bg,
         children: [
             {
@@ -186,31 +167,26 @@ const imageBackground = [
             },
             {
                 id: 2,
-<<<<<<< HEAD
                 imgUrl: xinzhongshi_2,
                 peopleCount: 2
             },
             {
                 id: 3,
-<<<<<<< HEAD
                 imgUrl: xinzhongshi_3,
                 peopleCount: 2
             },
             {
                 id: 4,
-<<<<<<< HEAD
                 imgUrl: xinzhongshi_4,
                 peopleCount: 3
             },
             {
                 id: 5,
-<<<<<<< HEAD
                 imgUrl: xinzhongshi_5,
                 peopleCount: 4
             },
             {
                 id: 6,
-<<<<<<< HEAD
                 imgUrl: xinzhongshi_6,
                 peopleCount: 5
             }
@@ -218,7 +194,6 @@ const imageBackground = [
     },
     {
         id: 5,
-<<<<<<< HEAD
         titleImgUrl: luying_bg,
         children: [
             {
@@ -228,31 +203,26 @@ const imageBackground = [
             },
             {
                 id: 2,
-<<<<<<< HEAD
                 imgUrl: luying_2,
                 peopleCount: 2
             },
             {
                 id: 3,
-<<<<<<< HEAD
                 imgUrl: luying_3,
                 peopleCount: 2
             },
             {
                 id: 4,
-<<<<<<< HEAD
                 imgUrl: luying_4,
                 peopleCount: 3
             },
             {
                 id: 5,
-<<<<<<< HEAD
                 imgUrl: luying_5,
                 peopleCount: 4
             },
             {
                 id: 6,
-<<<<<<< HEAD
                 imgUrl: luying_6,
                 peopleCount: 5
             }
@@ -260,7 +230,6 @@ const imageBackground = [
     },
     {
         id: 6,
-<<<<<<< HEAD
         titleImgUrl: paidui_bg,
         children: [
             {
@@ -270,31 +239,26 @@ const imageBackground = [
             },
             {
                 id: 2,
-<<<<<<< HEAD
                 imgUrl: paidui_2,
                 peopleCount: 2
             },
             {
                 id: 3,
-<<<<<<< HEAD
                 imgUrl: paidui_3,
                 peopleCount: 2
             },
             {
                 id: 4,
-<<<<<<< HEAD
                 imgUrl: paidui_4,
                 peopleCount: 3
             },
             {
                 id: 5,
-<<<<<<< HEAD
                 imgUrl: paidui_5,
                 peopleCount: 3
             },
             {
                 id: 6,
-<<<<<<< HEAD
                 imgUrl: paidui_6,
                 peopleCount: 5
             }