revert previous changes

don't revert automatic merges