created boards with pins
fix merge conflicts
fix more merge conflicts