fix some content, change grower button
fix merge conflict