updated merge_with_upstream.sh so that it does not fail if upstream h…

…as already been added.

merge_with_upstream.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 git checkout "$1"
-git remote add upstream https://github.com/unifyai/ivy.git
+git remote add upstream https://github.com/unifyai/ivy.git || true
 git fetch upstream
 git merge upstream/master --no-edit
 git push