added hello
added hello
added go away
added go away
added some text
deleted stuff
fixed merge conflict