removing leftover merge nonsense