Fix for your branch is based on origin/master but the upstream is gone warning