Recommend Rebase, Matrix link

content/page/building.md

@@ -54,11 +54,11 @@ Alternatively, you can also use the **Update Project** button on the toolbar:
 
 ![](/img/building/09-2.png)
 
-10\) Choose whether to "Merge incoming changes into the current branch" or to "Rebase the current branch on top of incoming changes" and click **OK** to proceed.
+10\) Choose whether to "Merge incoming changes into the current branch" or to "Rebase the current branch on top of incoming changes" (Recommended) and click **OK** to proceed.
 
 ![](/img/building/10.png)
 
 11\) Repeat steps 7 and 8 to build and install the updated app.
 
-If you’re interested in getting involved or following the progress of the project, please [join the development mailing list](https://lists.sourceforge.net/lists/listinfo/briar-devel), [IRC channel](https://webchat.freenode.net/#briar) or [Mattermost channel](https://chat.briarproject.org/briar/channels/town-square).
+If you’re interested in getting involved or following the progress of the project, please [join the development mailing list](https://lists.sourceforge.net/lists/listinfo/briar-devel), [IRC channel](https://webchat.freenode.net/#briar) or [Matrix channel](https://matrix.to/#/#freenode_#briar:matrix.org).