From 1053fcb6453ba4e1a38f715f64a0a2d6745b3973 Mon Sep 17 00:00:00 2001
From: Liliana <“llovo@ufl.edu”>
Date: Thu, 7 Sep 2017 13:46:58 -0400
Subject: [PATCH 1/4] test

---
 Liliana Lovo | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Liliana Lovo

diff --git a/Liliana Lovo b/Liliana Lovo
new file mode 100644
index 0000000..93f6c6b
--- /dev/null
+++ b/Liliana Lovo	
@@ -0,0 +1 @@
+Liliana Lovo
\ No newline at end of file

From d99511f9b425ca89c4c44da6095d9d102e4e000b Mon Sep 17 00:00:00 2001
From: Zach <zmurta@ufl.edu>
Date: Thu, 7 Sep 2017 13:51:40 -0400
Subject: [PATCH 2/4] added hi

---
 Liliana Lovo | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Liliana Lovo b/Liliana Lovo
index 93f6c6b..443192c 100644
--- a/Liliana Lovo	
+++ b/Liliana Lovo	
@@ -1 +1,2 @@
-Liliana Lovo
\ No newline at end of file
+Liliana Lovo
+Hi
\ No newline at end of file

From e938993649ecf78e0ac5db86ee93b7eefeb42fc8 Mon Sep 17 00:00:00 2001
From: Liliana <“llovo@ufl.edu”>
Date: Thu, 7 Sep 2017 14:00:05 -0400
Subject: [PATCH 3/4] another test

---
 Liliana Lovo | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Liliana Lovo b/Liliana Lovo
index 93f6c6b..c9f8b74 100644
--- a/Liliana Lovo	
+++ b/Liliana Lovo	
@@ -1 +1,5 @@
-Liliana Lovo
\ No newline at end of file
+Liliana Lovo
+
+Part 2
+
+Hi

From 3ffc59d8a0df4b61c92bb48bd66da0374b1ec44f Mon Sep 17 00:00:00 2001
From: Liliana <“llovo@ufl.edu”>
Date: Thu, 7 Sep 2017 14:10:15 -0400
Subject: [PATCH 4/4] test

---
 Liliana Lovo | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 Liliana Lovo

diff --git a/Liliana Lovo b/Liliana Lovo
deleted file mode 100644
index cc41f8e..0000000
--- a/Liliana Lovo	
+++ /dev/null
@@ -1,9 +0,0 @@
-Liliana Lovo
-<<<<<<< HEAD
-
-Part 2
-
-Hi
-=======
-Hi
->>>>>>> d99511f9b425ca89c4c44da6095d9d102e4e000b