Removed some text from a merge