diff --git a/dist/reveal.css b/dist/reveal.css
index 4dcc71b0..843199a3 100644
--- a/dist/reveal.css
+++ b/dist/reveal.css
@@ -1,9 +1,5 @@
 /*!
-<<<<<<< HEAD
 * reveal.js 4.3.1
-=======
-* reveal.js 4.1.3
->>>>>>> 62a85d55f8820c93dd2e60e34600b6eded8f7726
 * https://revealjs.com
 * MIT licensed
 *