removed leftover merge tokens