Removed conflict leftovers.