reset to upstream/master