changed "git pull" to "git fetch" and "git merge", rescue Exception for "git diff"