ups. lost the main sketch
found it again
fix conflict