Fixed a couple of merge conflict leftovers.