removed leftover merge conflict text