add scratch blocks rendering
fix merge conflicts
fix more merge conflicts
fix more merge conflicts