fixed error from leftover merge conflict text