diff --git a/src/devices/audio/avoiding_pi.jd b/src/devices/audio/avoiding_pi.jd
index e884f8c..ec407d7 100644
--- a/src/devices/audio/avoiding_pi.jd
+++ b/src/devices/audio/avoiding_pi.jd
@@ -182,13 +182,8 @@
 </p>
 
 <p class="note"><strong>Note:</strong> Atomic operations and their interactions with memory barriers
-<<<<<<< HEAD
-are notoriously badly misunderstood and used incorrectly. These methods are
-included here for completeness but recommend you also read the article
-=======
 are notoriously badly misunderstood and used incorrectly. We include these methods
 here for completeness but recommend you also read the article
->>>>>>> goog/lmp-dev
 <a href="https://developer.android.com/training/articles/smp.html">
 SMP Primer for Android</a>
 for further information.