show stuff
merge conflicts
things are working