origin/master set to upstream
simplified