Fix to broken merge