diff --git a/diff.json b/diff.json
index dd348e4..9ea3e0d 100644
--- a/diff.json
+++ b/diff.json
@@ -164,7 +164,7 @@
 "132423":["130609"],
 "132424":["130630"],
 "132425":["130626"],
-"132426":["130607"],
+"132426":["130636"],
 "132427":["130627"],
 "132428":["130631"],
 "132429":["130623"],
@@ -303,7 +303,7 @@
 "139019":["130110"],
 "139020":["130207"],
 "140101":["140106"],
-"140102":["140106"],
+"140102":["140105","140106"],
 "140103":["140108"],
 "140104":["120103"],
 "140111":["140181"],
@@ -2235,10 +2235,7 @@
 "420123":["420116"],
 "420124":["420117"],
 "420201":["420202"],
-<<<<<<< Updated upstream
 "420211":["420204"],
-=======
->>>>>>> Stashed changes
 "420220":["420204"],
 "420221":["420281"],
 "420301":["420302"],
diff --git a/history.json b/history.json
index 494a6d3..4bb459d 100644
--- a/history.json
+++ b/history.json
@@ -5553,7 +5553,6 @@
 "512126":"大足县",
 "512127":"荣昌县",
 "512128":"璧山县",
-<<<<<<< Updated upstream
 "512129":"蒲江县",
 "512130":"邛崃县",
 "512131":"大邑县",
@@ -5561,10 +5560,8 @@
 "512200":"万县地区",
 "512201":"万县市",
 "512202":"市中区",
-=======
 "512200":"万县地区",
 "512201":"万县市",
->>>>>>> Stashed changes
 "512221":"万县",
 "512222":"开县",
 "512223":"忠县",
@@ -5597,10 +5594,7 @@
 "512330":"秀山县",
 "512400":"内江地区",
 "512401":"内江市",
-<<<<<<< Updated upstream
 "512402":"泸州市",
-=======
->>>>>>> Stashed changes
 "512421":"内江县",
 "512422":"资中县",
 "512423":"资阳县",
@@ -5609,7 +5603,6 @@
 "512426":"隆昌县",
 "512427":"安岳县",
 "512428":"乐至县",
-<<<<<<< Updated upstream
 "512429":"古蔺县",
 "512430":"叙永县",
 "512431":"长宁县",
@@ -5618,8 +5611,6 @@
 "512434":"高县",
 "512435":"筠连县",
 "512436":"屏山县",
-=======
->>>>>>> Stashed changes
 "512500":"宜宾地区",
 "512501":"宜宾市",
 "512502":"泸州市",