corrected upstream_fetch to give the correct response
after adding an upstream remote, fetch upstream
added upstream_pull which fetches and then merges