stuff
changes to about
ABOUT fixed merge conflicts