more weird merge fixes