From cfa8b821289f5128e9c05a533cba04f9c061a012 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <70987828+Xiao-MoMi@users.noreply.github.com>
Date: Tue, 26 Jul 2022 17:01:39 +0800
Subject: [PATCH 1/2] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index a841364..1444028 100644
--- a/README.md
+++ b/README.md
@@ -69,10 +69,6 @@ NEVER SET "only-grow-in-loaded-chunks" FALSE IF YOU DON'T DISABLE THE THREE FEAT
 ### Placeholders
 %customcrops_season% show the season in the world\
 %customcrops_season_[world]%\
-<<<<<<< HEAD
-=======
-
->>>>>>> 5b4051e47471e1fef498039557036ccff8060511
 ==== these papi below will be accurate only in "Auto" mode ====\
 %customcrops_nextseason% show the days to the next season\
 %customcrops_nextseason_[world]%\

From 76741a6da608ac57949196aa5e06b3a14c55007a Mon Sep 17 00:00:00 2001
From: Jooeun Park <89099318+Jep4@users.noreply.github.com>
Date: Wed, 27 Jul 2022 23:27:25 -0700
Subject: [PATCH 2/2] Update README.md

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 1444028..4c421ba 100644
--- a/README.md
+++ b/README.md
@@ -22,12 +22,13 @@ Crops will grow at a specified time which you will see in the config.\
 All crops will grow successively if their pot is watered.
 
 ### Season & Greenhouse
-Season is an important part of StardewValley Farming System
-which means crops only grow in a suitable season. Inproper
-seasons will make crops into dead stage but you can use 
-greenhouse glass to allow them grow all year.\
+Season is now an important part of StardewValley Farming System.
+Crops only grow in a suitable season and inproper
+seasons will make crops into a dead stage. 
+You can use greenhouse glass to allow them to grow all year.\
 Season change has two modes: Automatic and Command\
-You might use command to change season to sync other plugin's season for example RealisticSeason.
+You might use the command to change the season to sync another plugin's season, for example RealisticSeason.
+
 
 ### Fertilizer
 There are three templates of fertiziliers: \