some text
another message
merged in fubar