diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
index 897bdc82..dee261df 100644
--- a/makespec/BUILDVERSION
+++ b/makespec/BUILDVERSION
@@ -1 +1 @@
-139
+140
diff --git a/src/base/LemonConfig.cpp b/src/base/LemonConfig.cpp
index d793aaea..ad0d9c95 100644
--- a/src/base/LemonConfig.cpp
+++ b/src/base/LemonConfig.cpp
@@ -12,7 +12,6 @@
 
 namespace Lemon::base::config {
 
-<<<<<<< HEAD
 	int LemonConfigJudge::read(const QJsonObject &json) {
 		READ_JSON(json, defaultFullScore);
 		READ_JSON(json, defaultTimeLimit);
@@ -21,18 +20,6 @@ namespace Lemon::base::config {
 		READ_JSON(json, specialJudgeTimeLimit);
 		READ_JSON(json, fileSizeLimit);
 		READ_JSON(json, rejudgeTimes);
-=======
-	void LemonConfigJudge::read(const QJsonObject &json) {
-		READ_JSON_INT(defaultFullScore)
-		READ_JSON_INT(defaultTimeLimit)
-		READ_JSON_INT(defaultMemoryLimit)
-		READ_JSON_INT(compileTimeLimit)
-		READ_JSON_INT(specialJudgeTimeLimit)
-		READ_JSON_INT(fileSizeLimit)
-		READ_JSON_INT(rejudgeTimes)
-        
-		READ_JSON_DOUBLE(defaultExtraTimeRatio)
->>>>>>> 4862b98 (fix(config): add lost defaultExtraTimeRatio)
 
 		READ_JSON(json, defaultInputFileExtension);
 		READ_JSON(json, defaultOutputFileExtension);