diff --git a/PS文件/蜀/SHU001刘备.png b/PS文件/蜀/SHU001刘备.png
index c98d57f..ef71183 100644
--- a/PS文件/蜀/SHU001刘备.png
+++ b/PS文件/蜀/SHU001刘备.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d9a227dd2788012b44f4e028ff25898548051fd51314025be6e32f740109d5f
-size 291
+oid sha256:c6208e889268e93a32de739c57ba190fd04496a249c5dab47f1b7e3aaa95b954
+size 1370512
diff --git a/PS文件/蜀/SHU001刘备.psd b/PS文件/蜀/SHU001刘备.psd
index 9300c0b..14847c6 100644
--- a/PS文件/蜀/SHU001刘备.psd
+++ b/PS文件/蜀/SHU001刘备.psd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f22cc50fafac8f738c1dc0beabb06cbccb8032270866935668a2764d82451e19
-size 293
+oid sha256:a8ff58d71925c7eb2e2c67764ec9bfd704d130c4ab0ea599b129be7cd1194d67
+size 14554771
diff --git a/PS文件/魏/WEI001曹操.png b/PS文件/魏/WEI001曹操.png
index 866d319..6e8938a 100644
--- a/PS文件/魏/WEI001曹操.png
+++ b/PS文件/魏/WEI001曹操.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a3cfd047be262e3adde71b07ce7750fa396d05197f6073d936fb69eec9cd543
-size 291
+oid sha256:2fa65c474a84e1f1498a5ee50690bb73777db2abf7ea9b5408b786062e3b4dde
+size 1495927
diff --git a/PS文件/魏/WEI001曹操.psd b/PS文件/魏/WEI001曹操.psd
index cfd6cb0..0eae8bc 100644
--- a/PS文件/魏/WEI001曹操.psd
+++ b/PS文件/魏/WEI001曹操.psd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e65398533f04b7f1e7f6adbad72c05871ef418e996990938de8b3e42e9680d2
-size 293
+oid sha256:b9c18633b44058af5ab671f50e3e5a6fb4cc13b9fd351c19ba261e5f156bf8ee
+size 18221806
diff --git a/README.md b/README.md
index 09912ae..610b541 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@ Height 89.92 mm
 祝融:	   "巨象"可以捡南蛮,自带+1.
 荀彧:	   "节命"描述bug.
 
+<<<<<<< HEAD
 公孙瓒:	    字体间距.使用坐骑牌也能发动.
 庞德"	   "猛进"和公孙瓒做出区分.
 曹操:	   "挥鞭"描述bug
@@ -67,6 +68,8 @@ Height 89.92 mm
 顾雍:	   "慎行"有概率摸牌.
 徐盛:	   "破军"附加移牌效果.
 豹变牌:	   "挑衅"描述需要更新,
+=======
+>>>>>>> fuck
 
 
 ### 2020/01/10