diff --git a/static/images/CPA.svg b/static/images/CPA.svg
index cf0a7255..12b0cf05 100644
--- a/static/images/CPA.svg
+++ b/static/images/CPA.svg
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
@@ -95,36 +94,3 @@
 		260.16,150.353 260.16,178.913 263.84,178.913 263.84,165.873 278.28,165.873 	"/>
 </g>
 </svg>
-=======
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="482" height="279" viewBox="0 0 482 279">
-  <metadata><?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
-<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c142 79.160924, 2017/07/13-01:06:39        ">
-   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-      <rdf:Description rdf:about=""/>
-   </rdf:RDF>
-</x:xmpmeta>
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                           
-<?xpacket end="w"?></metadata>
-<image id="图层_1" data-name="图层 1" width="482" height="279" xlink:href="data:img/png;base64,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"/>
-</svg>
->>>>>>> 21b2f095716bd145e37a93351fe080a807ec1632