fixed errors from leftover merge conflict markers