lol stuff works sorta
merj conflict
more merge
Did some of the make-look-nice