revert master to upstream