stuff
other stuff
my merge
added diagram text art.