diff --git a/盘荣博/数据可视化/week1.py b/盘荣博/数据可视化/week1.py
index 66aa09d..f25e991 100644
--- a/盘荣博/数据可视化/week1.py
+++ b/盘荣博/数据可视化/week1.py
@@ -1,5 +1,4 @@
 import pandas as pd
-<<<<<<< HEAD
 import numpy as np
 from  scipy.stats import zscore
 from sklearn.decomposition import PCA