revert some commits for the master branch