revert files to upstream/master