Fix leftover merge conflict