Okay wait... github is actually broken... this should raise a merge conflict.

I updated the fix: merge conflict commit which should have been force pushed to the gitbook branch. However, the gitbook branch is protected, so I intended to create a separate branch and raise another PR to it. Then fix a merge conflict on the fix: merge conflict commit.

BUT looking at the history of this PR, docs(GITBOOK#206): Big Update: Adding NoPorts Desktop Docs is showing up, which should not be the case... this should either not be included in this PR at all. AND fix: merge conflict commit should have caused a merge conflict, as it is a superset of the changeset in the latest commit on the gitbook branch.

Something is very wrong, hence I set the PR to draft.