Fixed the broken merge