diff --git a/levels/cherry-pick.rb b/levels/cherry-pick.rb
index 3f361a9d..005880e5 100644
--- a/levels/cherry-pick.rb
+++ b/levels/cherry-pick.rb
@@ -3,6 +3,7 @@
 
 setup do
     init_from_level
+    `git stash` #fix for README.md being in githug root an the level
 end
 
 solution do
diff --git a/levels/cherry-pick/.githug/hooks/applypatch-msg.sample b/levels/cherry-pick/.githug/hooks/applypatch-msg.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/commit-msg.sample b/levels/cherry-pick/.githug/hooks/commit-msg.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/post-update.sample b/levels/cherry-pick/.githug/hooks/post-update.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/pre-applypatch.sample b/levels/cherry-pick/.githug/hooks/pre-applypatch.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/pre-commit.sample b/levels/cherry-pick/.githug/hooks/pre-commit.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/pre-rebase.sample b/levels/cherry-pick/.githug/hooks/pre-rebase.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/prepare-commit-msg.sample b/levels/cherry-pick/.githug/hooks/prepare-commit-msg.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/hooks/update.sample b/levels/cherry-pick/.githug/hooks/update.sample
old mode 100755
new mode 100644
diff --git a/levels/cherry-pick/.githug/index b/levels/cherry-pick/.githug/index
index d4dc9e76..6faf233a 100644
Binary files a/levels/cherry-pick/.githug/index and b/levels/cherry-pick/.githug/index differ