Fixed are.md file

docs/getting_started/are.md

@@ -29,7 +29,6 @@ If you are new to ACCESS, follow the [First Steps](/getting_started/first_steps)
 <!-- End of tab contents -->
 
 ### Session options
-<<<<<<< HEAD
 Launching an ARE session is similar to submitting an interactive [PBS job](https://opus.nci.org.au/display/Help/4.+PBS+Jobs) that enables you to connect to a _Gadi_ computing node.<br>
 Therefore, there are multiple [PBS directives](https://opus.nci.org.au/display/Help/PBS+Directives+Explained) and other options you can select:
 
@@ -78,77 +77,6 @@ Therefore, there are multiple [PBS directives](https://opus.nci.org.au/display/H
 <!-- Jupyterlab -->
     <div>
         <ul>
-=======
-Launching an ARE session is similar to submitting an interactive <a href="https://opus.nci.org.au/display/Help/4.+PBS+Jobs" target="_blank">PBS job</a> that enables you to connect to a <i>Gadi</i> computing node.
-<br>
-Therefore, there are multiple <a href="https://opus.nci.org.au/display/Help/PBS+Directives+Explained" target="_blank">PBS directives</a> and other options you can select:
-<ul>
-    <li>
-        <b id="walltime-option">Walltime (hours)</b>
-        <br>
-        Number of hours your VDI session will run for (unless manually ended earlier).
-        <br>
-        The maximum number of hours an ARE session can run for depends on the selected Queue. For more information, check <a href="https://opus.nci.org.au/display/Help/Queue+Limits" target="_blank">Gadi Queue Limits</a>.
-        <div class='admonition warning'>
-            Once the session ends any operation still in progress on the session's computing node(s) will be immediately terminated.
-        </div>
-    </li>
-    <li>
-        <b>Queue</b>
-        <br>
-        Gadi queue that your session will be scheduled in. For more information check <a href="https://opus.nci.org.au/display/Help/Queue+Structure" target="_blank">Gadi Queue Structure</a>.
-    </li>
-    <li>
-        <b>Compute Size</b>
-        <br>
-        Amount of resources (CPUs, Memory, etc.) available to your session.
-        <br>
-        You can either choose a pre-configured option, or select a custom one (e.g., <i>cpus=6 mem=40G</i>).
-    </li>
-    <li>
-        <b>Project</b>
-        <br>
-        The NCI project the ARE session will be charged to.
-        <br>
-        You must be a member of the specified project.
-        <div class='admonition warning'>
-            The specified project must have allocated <i>Service Units</i> (SU).
-            <br>
-            For more information, check <a href="/getting_started/first_steps#join-relevant-nci-projects">how to join relevant NCI projects</a>.
-        </div>
-    </li>
-    <li>
-        <b id="storage-option">Storage</b>
-        <br>
-        <code>/g/data</code> (inserted as <i>gdata/&lt;project-ID&gt;</i>) and <code>/scratch</code> (inserted as <i>scratch/&lt;project-ID&gt;</i>) data storage projects that will be available to the session.
-        <br>
-        In ARE, data storage locations need to be explicitly defined. This means that you need to insert any <code>/g/data</code> and <code>/scratch</code> project folders you want to execute data I/O operations from.
-        <br>
-        Multiple storage projects are separated by a plus (<i>+</i>) (e.g., <i>gdata/tm70+gdata/hh5+scratch/xp65</i>).
-        <div class='admonition warning'>
-            Generally, you need to be a member of the specified projects to access their storage data.
-            <br>
-            If you try to access data from a project folder not included in the session's storage, you will get an error similar to the following:
-            <br>
-            <code>&lt;cmd&gt;: cannot access '&lt;/path/to/file&gt;': No such file or directory</code>
-        </div>
-    </li>
-    <li>
-        <b>Software</b>
-        <br>
-        Software licenses that are requested for your ARE session. Leave blank if no license needed.
-        <br>
-        Multiple licenses are separated by a colon (<i>:</i>).
-    </li>
-    <h4>Advanced options</h4>
-    <!-- Tab contents -->
-    <div class="tabContents" label="are-apps">
-        <!-- VDI -->
-        <div>
-        </div>
-        <!-- Jupyterlab -->
-        <div>
->>>>>>> development
             <li>
                 <b>Extra arguments</b>
                 <br>