Fix broken merge