Wip: fix some merge failures