Fix broken manual merge