resolve conflicts and docsgen

CHANGELOG.md

@@ -1,27 +1,10 @@
 # Lotus changelog
 
-<<<<<<< HEAD
+# 1.11.1 / 2021-08-16
-# 1.11.1-rc3 / 2021-08-13
-||||||| parent of be7007492 (Add ChangeLog)
-# 1.11.1-rc2 / 2021-08-01
-=======
-# 1.11.1 / 2021-08-02
->>>>>>> be7007492 (Add ChangeLog)
 
 > Note: for discussion about this release, please comment [here](https://github.com/filecoin-project/lotus/discussions/6904)
 
-<<<<<<< HEAD
-This is the final release candidate for the **highly-recommended** but optional Lotus v1.11.1 release that introduces 
-many deal making and datastore improvements and new features along with other bug fixes. Highlights are:
-- [lotus-miner market subsystem](https://docs.filecoin.io/mine/lotus/split-markets-miners/#frontmatter-title)
-- **Under Testing** [splistore](https://github.com/filecoin-project/lotus/blob/master/blockstore/splitstore/README.md)
-||||||| parent of be7007492 (Add ChangeLog)
-This is the second release candidate for the **highly-recommended** but optional Lotus v1.11.1 release that introduces many deal making and datastore improvements and new features along with other bug fixes. A more organized and detailed release note will be shared in the next few days with future RCs, highlights are:
-- **Experimental** [lotus-miner market subsystem](https://docs.filecoin.io/mine/lotus/split-markets-miners/#frontmatter-title)
-- **Under Testing** [splistore](https://github.com/filecoin-project/lotus/blob/master/blockstore/splitstore/README.md)
-=======
 This is a  **highly recommended** but optional Lotus v1.11.1 release that introduces many deal making and datastore improvements and new features along with other bug fixes. 
->>>>>>> be7007492 (Add ChangeLog)
 
 ## Highlights
 - ⭐️⭐️⭐️[**lotus-miner market subsystem**](https://docs.filecoin.io/mine/lotus/split-markets-miners/#frontmatter-title) is introduced in this release! It is **highly recommended** for storage providers to run markets processes on a separate machine! Doing so, only this machine needs to exposes public ports for deal making. This also means that the other miner operations can now be completely isolated by from the deal making processes and storage providers can stop and restarts the markets process without affecting an ongoing Winning/Window PoSt!

documentation/en/cli-lotus-miner.md

@@ -7,7 +7,7 @@ USAGE:
    lotus-miner [global options] command [command options] [arguments...]
 
 VERSION:
-   1.11.1-rc3
+   1.11.1
 
 COMMANDS:
    init     Initialize a lotus miner repo

documentation/en/cli-lotus-worker.md

@@ -7,7 +7,7 @@ USAGE:
    lotus-worker [global options] command [command options] [arguments...]
 
 VERSION:
-   1.11.1-rc3
+   1.11.1
 
 COMMANDS:
    run         Start lotus worker

documentation/en/cli-lotus.md

@@ -7,7 +7,7 @@ USAGE:
    lotus [global options] command [command options] [arguments...]
 
 VERSION:
-   1.11.1-rc3
+   1.11.1
 
 COMMANDS:
    daemon   Start a lotus daemon process