Fixed broken merge