diff --git a/flickity/FlickityEvents.ts b/flickity/FlickityEvents.ts
index 4beb5989b..6263aef8e 100644
--- a/flickity/FlickityEvents.ts
+++ b/flickity/FlickityEvents.ts
@@ -1,6 +1,10 @@
 // Event Constants for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
+<<<<<<< HEAD
 // Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
+=======
+// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
+>>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db
 // Definitions: https://github.com/clmcgrath/
 class FlickityEvents {
 
diff --git a/flickity/flickity-tests.ts b/flickity/flickity-tests.ts
index 3f8b7bf73..fb03d7e5e 100644
--- a/flickity/flickity-tests.ts
+++ b/flickity/flickity-tests.ts
@@ -1,6 +1,10 @@
 // Type definition tests for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
+<<<<<<< HEAD
 // Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
+=======
+// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
+>>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db
 // Definitions: https://github.com/clmcgrath/
 
 ///<reference path="../jquery/jquery.d.ts"/>
diff --git a/flickity/flickity.d.ts b/flickity/flickity.d.ts
index 298a57c0b..07bfb9f2d 100644
--- a/flickity/flickity.d.ts
+++ b/flickity/flickity.d.ts
@@ -1,6 +1,10 @@
 // Type definitions for Flickity v1.1.1
 // Project: http://flickity.metafizzy.co/
+<<<<<<< HEAD
 // Definitions by: Chris McGrath <https://www.github.com/clmcgrath>
+=======
+// Definitions by: [Chris McGrath] <https://www.github.com/clmcgrath>
+>>>>>>> 6aea981d4bbc7cef299050738a791cc1b19d94db
 // Definitions: https://github.com/clmcgrath/