1 files changed, 5 insertions, 1 deletions
diff --git a/merge.sh b/merge.sh
index 8595bcfd..1080edb1 100755
--- a/merge.sh
+++ b/merge.sh
@@ -1,11 +1,15 @@
 #!/bin/bash
 
 git checkout master
-git pull local/master MaYor-dev
+git fetch update
+git fetch origin
+
 
 git checkout MaYor-dev
+git pull update master
 git merge devel
 
+
 git checkout master
 git merge MaYor-dev