default to upstream
resolve merge