diff --git a/notes/resonant_bodies_voices_memories.md b/notes/resonant_bodies_voices_memories.md
index 3c59d0f..a761929 100644
--- a/notes/resonant_bodies_voices_memories.md
+++ b/notes/resonant_bodies_voices_memories.md
@@ -1,9 +1,14 @@
 Notes from *Resonant Bodies, Voices, Memories*
 ==============================================
+Bangma, A. and Piet Zwart Instituut (eds.) (2009) *Resonant bodies, voices, memories*. Berlin: Revolver Publ.
 
+<<<<<<< HEAD
 (https://pad.xpub.nl/p/resonant_bodies_voices_memories)
 
 Bangma, A. and Piet Zwart Instituut (eds.) (2009) Resonant bodies, voices, memories. Berlin: Revolver Publ.
+=======
+https://pad.xpub.nl/p/resonant_bodies_voices_memories
+>>>>>>> 25fd4735c7f9bb377ac14e4ed7cf3d12273f07da
 
 'Phonophobia: The dumb devil of stammering' by Steven Connor, pages 132-144
 ---------------------------------------------------------------------------
@@ -104,4 +109,8 @@ Aristotle: "only creatures that have life can give voice, but not everything tha
 
 In coughs, whispers, drawls, hisses, hesitations, laughs, stammers the voice \"meets and mingles with what it is not---indeed, it is, in the end, nothing more than this mingling
 
+<<<<<<< HEAD
 The pathos and finesse of a voice that gives out, gives way, comes not from the virile figure it cuts against the ground of things, but rather from its suggestion of a *persona*---a being that has its being 'through sound', which is like our own bodies, rather than our dream of those bodies" (pg 144)
+=======
+"The pathos and finesse of a voice that gives out, gives way, comes not from the virile figure it cuts against the ground of things, but rather from its suggestion of a *persona*---a being that has its being 'through sound', which is like our own bodies, rather than our dream of those bodies" (pg 144)
+>>>>>>> 25fd4735c7f9bb377ac14e4ed7cf3d12273f07da