Fix broken merge conflicts