Deleted extraneous text from a merge