diff --git a/src/lib.rs b/src/lib.rs
index 2ca2b65..b2dd46b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -30,7 +30,6 @@ pub struct Blockquote {
     text: String,
 }
 
-<<<<<<< HEAD
 pub struct Link {
     text: String,
     url: Url,
@@ -43,7 +42,6 @@ pub struct Image {
     title: Option<String>,
     link: Option<Link>,
 }
-=======
 pub enum Node {
     Header(Header),
     Paragraph(Vec<StyledText>),
@@ -51,7 +49,6 @@ pub enum Node {
 }
 
 pub struct Document(Vec<Node>);
->>>>>>> d808ae46ad469d6024e76ad006f7b3e0832fe8cb
 
 // TODO: able take care of lists i am too drunk for this tonight