diff --git a/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html b/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
index 74e26d1..bd0ba99 100644
--- a/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
+++ b/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
@@ -32,11 +32,22 @@ title: Audio Setup
 
   <dt>Interface</dt>
   <dd>
+<<<<<<< HEAD:_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
     The selector should show all the supported interfaces that the are duplex capable (i.e. support input and output to and from Ardour). <strong>Important</strong> if you are using an Intel Mac running
     OS X and the built-in audio interface, you must
     first <a href="/setting-up-your-system/using_more_than_one_audio_device">merge
       its separate input and output devices into a single "aggregate
       device"</a> before Ardour will be able to use it.
+=======
+  <dd>The selector should show all availiable interfaces that driver
+      provides that are duplex capable for Ardour to
+      use. <strong>Important</strong> if you are using an Intel Mac
+      running OS X and the builtin audio interface, you must
+      first <a href="setting-up-your-system/us
+      ing_more_than_one_audio_device/">merge its separate input and
+      output devices into a single "aggregate device"</a> before
+      Ardour will be able to use it.<br>
+>>>>>>> minor patch for manual section on using multiple devices (from Thomas Vecchione):_manual/07_working-with-sessions/06_the-new-session-dialog/01_audio-setup.html
   </dd>
 
   <dt>Sample Rate</dt>