Leftover merge conflict