Fix leftover merge stuff