Fixed remnants of broken merge