resolve merge conflict

source/access/mfa_guide.rst

@@ -127,8 +127,8 @@ case you can start an instance of the agent with::
 .. note::
    If you start your agent in this way, it is only accessible within the context of your 
    current shell. If you want to connect with NoMachine NX, you should also start your 
-   NoMachine client from within this shell. Otherwise it will not be able to access the
-   certificate stored in your agent.
+   NoMachine client from within this shell via the ``nxplayer`` command. Otherwise it will 
+   not be able to access the certificate stored in your agent.
 
 (to kill the agent use ``eval "$(ssh-agent -k)"``)
 
@@ -166,8 +166,8 @@ If you now connect to the cluster using your standard ``ssh`` command, the
 certificate will automatically be stored for as long as your agent lives. 
 
 If you want to use apps that use ``ssh`` in the background (NX, FileZilla), you 
-should also first inject an certificate in your agent before trying to connect.
-This can be done via a direct ssh to the firewall page with agentforwarding enabled::
+should also first inject a certificate in your agent before trying to connect.
+This can be done by connecting to the VSC firewall page with agent forwarding::
 
     ssh -A [email protected]