Merge working branch inside master. The upstream-tracking branch will become master_upstream
master_upstream