Fixed a broken merge