remove leftover merge conflict