Fix previous broken merge