Revert "merging stuff"

This reverts commit 25e03b7850b9ef431c70f3aa4b2452639e71415e.
back to black
back to black2