diff --git a/colors.sh b/colors.sh
index 4a7b256e9deb96428544b5155e1a2c6282bdefdd..3336f5101955b17fc3095019148909d00a3deff4 100644
--- a/colors.sh
+++ b/colors.sh
@@ -1,13 +1,13 @@
 for i in {"red","pink","purple","deep purple","indigo","blue","light blue","cyan","teal","green","light green","lime","yellow","amber","orange","deep orange","brown","grey","blue grey"}
 do
+  git pull --rebase origin colors
+  git pull --rebase 
   echo "Setting color to: $i, ${i/ /_}, color_${i/ /_}"
   #git checkout -b color_${i/ /_}
   git checkout color_${i/ /_}
   sed -ri "s/(primary: ').*'/\1$i'/" mkdocs.yml
   #git cherry-pick bd8e358 
-  #git commit -am "Setting color to: $i"
-  git pull --rebase origin colors
-  git pull --rebase 
+  git commit -am "Setting color to: $i"
   git push --set-upstream origin color_${i/ /_}
   git checkout colors
 done
diff --git a/mkdocs.yml b/mkdocs.yml
index e543cfa1c6f88edf8655840c47e524b6b4b57e50..d12c69d6a0dbc3e8f2cf86388c3d27fe20fbfe66 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -190,8 +190,13 @@ pages:
 extra:
   logo: img/logo2.png
   palette:
-    primary: 'purple'
+<<<<<<< HEAD
+    primary: 'blue grey'
     accent: 'light blue'
+=======
+    primary: 'blue grey'
+    accent: 'red'
+>>>>>>> Setting color to: red
   font:
     text: 'Roboto'
     code: 'Roboto Mono'