reset to upstream master