fixed up broken merge