removed leftover merge text