diff --git a/.gitignore b/.gitignore
index b4a07b4..319df85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@
 !.kube/configs
 !wallpapers
 !wallpapers/**
+!.oh-my-zsh
+!.oh-my-zsh/**
diff --git a/.oh-my-zsh b/.oh-my-zsh
new file mode 160000
index 0000000..40fafe0
--- /dev/null
+++ b/.oh-my-zsh
@@ -0,0 +1 @@
+Subproject commit 40fafe0f59371d1a9d83b83c614acfd1d740aabb
diff --git a/.zshrc b/.zshrc
index 02d5598..f55633f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -11,12 +11,8 @@ export ZSH="/Users/beppe/.oh-my-zsh"
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
-<<<<<<< HEAD
-ZSH_THEME="robbyrussell"
-=======
 #ZSH_THEME="robbyrussell"
 ZSH_THEME="lambda-gitster"
->>>>>>> refs/remotes/origin/master
 
 
 # Set list of themes to pick from when loading at random