fix leftover merge conflict