diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04521832..f01a6095 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # 1.0.0 (2017-02-23)
 
 This release is a special one since it sets up in the path of a better development environment. Although it's far from
diff --git a/src/js/modules/webslides.js b/src/js/modules/webslides.js
index 748d03fa..1417d529 100644
--- a/src/js/modules/webslides.js
+++ b/src/js/modules/webslides.js
@@ -14,7 +14,7 @@ const PLUGINS = {
   'keyboard': Plugins.Keyboard,
   'nav': Plugins.Navigation,
   'scroll': Plugins.Scroll,
-  'touch': Plugins.touch
+  'touch': Plugins.Touch
 };
 
 export default class WebSlides {
diff --git a/src/js/plugins/grid.js b/src/js/plugins/grid.js
index c6e59899..f40ad28a 100644
--- a/src/js/plugins/grid.js
+++ b/src/js/plugins/grid.js
@@ -1,6 +1,6 @@
 import Keys from '../utils/keys';
 
-export default class Keyboard {
+export default class Grid {
   /**
    * Grid plugin that shows a grid on top of the WebSlides for easy prototyping.
    * @param {WebSlides} wsInstance The WebSlides instance