diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
new file mode 100644
index 0000000..787c6a9
--- /dev/null
+++ b/.github/workflows/linter.yml
@@ -0,0 +1,25 @@
+name: Linter
+
+# Run this workflow every time a new commit pushed to your repository
+on: push
+
+jobs:
+  # Set the job key. The key is displayed as the job name
+  # when a job name is not provided
+  super-lint:
+    # Name the Job
+    name: Lint code base
+    # Set the type of machine to run on
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checks out a copy of your repository on the ubuntu-latest machine
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # Runs the Super-Linter action
+      - name: Run Super-Linter
+        uses: github/super-linter@v3
+        env:
+          DEFAULT_BRANCH: main
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/deck.mdx b/deck.mdx
index 9e75eb0..913e374 100644
--- a/deck.mdx
+++ b/deck.mdx
@@ -34,13 +34,13 @@ ga file.txt
 gcam "super message"
 ```
 
---- 
+---
 
 ## Create a new branch
 
 `gb a_new_branch`
 
---- 
+---
 
 ## Work on a branch
 
@@ -90,7 +90,7 @@ Some text
 
 ## Lists
 
-``` 
+```
 * unordered list
 * unordered list
 ```
@@ -125,8 +125,8 @@ Some text
   - nested list
 - nested list
   - nested list
-  
-  
+
+
 ---
 
 ## Image
@@ -135,7 +135,7 @@ Some text
 ![this image](url)
 ```
 
-  
+
 ![Image of Yaktocat](https://octodex.github.com/images/yaktocat.png)
 
 
@@ -186,7 +186,7 @@ some code
 more code
 ```
 
---- 
+---
 
 ## extras
 
@@ -221,7 +221,7 @@ git cherry-pick SHA
 gcp SHA
 ```
 
---- 
+---
 
 ## How to use git fragments
 
@@ -280,7 +280,7 @@ grhh SHA
 
 ```
 
---- 
+---
 
 ## How to rebase like a boss
 
@@ -291,6 +291,10 @@ git rebase -i <earlier SHA>
 
 __What’s happening__: `-i` puts rebase in “interactive mode”. It starts off like the rebase discussed above, but before replaying any commits, it pauses and allows you to gently modify each commit as it’s replayed.
 
----
+## How to deal with conflicts
+
+Let's generate some conflicts
+
+blabla
+
 
-## How to deal with conflicts