Merging text

Editing out the merge-message