Ismael Gomez
51521ad8e4
Improved PDCCH blind search and fixed a few issues with ambiguous DCI size with Release 10
4 years ago
Xavier Arteaga
af8898943f
SRSENB: implement console cell_gain command
...
SRSENB: fix 5GNR compilation
SRSENB: fix override methods
4 years ago
Ismael Gomez
0afcea9d61
Do not allow empty TBS PUSCH. Account for CQI from inactive cells before activated. ( #1667 )
4 years ago
Xavier Arteaga
3aec23f7d8
SRSENB: calculate TA from PUCCH messages
4 years ago
Xavier Arteaga
0e96ef3df0
Channel emulator takes SNR as input parameter
4 years ago
faluco
0a01bd4e1b
- Fix a race condition where the prach struct was being free while the prach worker was still running.
...
This could cause heap corruption making the enb_phy_test to fail sometimes.
4 years ago
Xavier Arteaga
55a208ede8
SRSENB: added PRACH worker plot
4 years ago
Xavier Arteaga
443378adcb
SRSENB: Add GUI window for every cell/carrier
4 years ago
Ismael Gomez
dda91b14f7
Remove duplicate add_rnti() function since already done in set_config
4 years ago
Ismael Gomez
b3d24ba420
Do not set cells to inactive during reconfiguration if already active
4 years ago
Xavier Arteaga
fda1d040e7
SRSENB: implement PUSCH threshold for UCI bits
4 years ago
Xavier Arteaga
0192130742
SRSUE/SRSENB: UCI bits are carrier by the lowest serving cell index
...
SRSENB: Fix UCI in lowest serving cell index PUSCH transmission
4 years ago
Ismael Gomez
493b7ea2da
Remove SNR threshold based link failure detection
4 years ago
Francisco Paisana
421d5f3852
merge next
4 years ago
Francisco Paisana
86adbfceae
fix nr stack activation
4 years ago
Ismael Gomez
e26653c87f
Move tti_clock() call from worker_end to txrx class in enb
4 years ago
Xavier Arteaga
f04cf2090a
Integrates number of samples in radio buffer
...
Fix minor issue
Radio: Fix minor bug and add unit test
4 years ago
Xavier Arteaga
89b24b54e5
Refactored radio class for acommodating multiple RF devices
4 years ago
Francisco Paisana
057980d1fb
use common log helper macros
4 years ago
Francisco Paisana
27e5d98ef9
added vnf phy nr
4 years ago
Ismael Gomez
60b5fb9a74
Refactor variable name
4 years ago
Ismael Gomez
edb1fcc892
srsENB: Apply new PUCCH configuration when setting dedicated config
4 years ago
Xavier Arteaga
039f2164a6
Initial Sounding Reference Signals implementation
4 years ago
Xavier Arteaga
6398cd841d
SRSENB: PHY reports MAC all UL grants
4 years ago
Xavier Arteaga
fbce38dc27
SRSENB: PHY tries to remove always the RNTI in PHY-lib. No error messages prompted.
4 years ago
Ismael Gomez
6a19a19f00
Fix memory fault during exiting and waiting for worker
5 years ago
Ismael Gomez
270c7ce9dc
Separate PHY interface to add rnti and pregenerate sequences. Calculate the sequences on the reception of ConnectionSetup instead of PRACH
5 years ago
Xavier Arteaga
9d5c2d70df
SRSENB: Fix PHY reconfiguration for HO
...
Minimal aesthetic change
5 years ago
Francisco Paisana
f43985b6cd
small updates for testing handover and configuring the rrc
5 years ago
Xavier Arteaga
b11ffaee7e
SRSENB: fix channel emulator for multiple channels
5 years ago
Xavier Arteaga
d94078d543
Minor changes
...
Fix UE sequence generation
minor change
5 years ago
yagoda
faf1cf6975
limiting prach search space to number of prachs set in sib2
5 years ago
Francisco Paisana
12b2ea7dde
remove warnings for base classes with no virtual dtors
5 years ago
Francisco Paisana
b8e6ba02e4
remove warnings related to unused vars and fwd declarations with trivial dtors
5 years ago
Xavier Arteaga
d7e7399e7b
srsENB: PHY configuration in two stages
5 years ago
Xavier Arteaga
b9583d4182
Fix Extended CSI request bits in DCI
5 years ago
Xavier Arteaga
77d5dedddc
Fix LGTM warnings and recommendations
5 years ago
Xavier Arteaga
4756319e8f
Reduce PHY logging
5 years ago
Xavier Arteaga
5b7493cab5
Added 256QAM modulation tables to scheduler
5 years ago
Xavier Arteaga
784bf81a1a
Multiple fixes HARQ ACK/NACK feedback and CSI reporting for MIMO and CA
5 years ago
Andre Puschmann
3e916ac3a8
srsenb_phy: only wait for txrx thread if it has actually been started
5 years ago
Xavier Arteaga
9a2b0b7cc7
Standard vector allocation uses vector library
5 years ago
Francisco Paisana
69486f2953
took out change in cc_worker to force retxs
5 years ago
Francisco Paisana
179e959d05
fix msg3 retx issue. Now nof_prb for pucch above 1 are forbidden for prb==6
5 years ago
Ismael Gomez
9a264b62c4
Protect access to shared grants ( #1117 )
...
* Protect access to shared grants
* Set correct number of carriers for DL
* Fix previous issues
* Address comments
5 years ago
Xavier Arteaga
8e891b7038
Added AWGN channel to SRSUE and SRSENB
5 years ago
Xavier Arteaga
2c93f6d20a
Fix PUCCH DMRS correlation
5 years ago
Ismael Gomez
fd3d4a7874
Refactor thread_pool: use std::mutex and fix some hidden potential bugs
5 years ago
Francisco Paisana
34bc48d31a
fix cfi to cc assignment
5 years ago
Xavier Arteaga
0408d357a7
Minor fixes
5 years ago
Ismael Gomez
73447972d8
Fix issue with simultaneous CQI and ACK/NACK transmission in CA ( #1067 )
...
* Fix memory corruption when phy calling mac scheduler and not yet initiated
* Do not drop CQI if collision with ACK/NACK and PUSCH
* Allocate CQI resources for SCell properly
* Use UE_PCELL_CC_IDX macro
* Protect ul_sched from being called if not yet started
5 years ago
Xavier Arteaga
e832769ae6
Updated copyright
5 years ago
Xavier Arteaga
caf7b514a0
Avoid TTI initial magic number
5 years ago
Xavier Arteaga
5af89513eb
use double precission for frequency in srsue and srsenb
5 years ago
Xavier Arteaga
834a081c09
Add EPRE measurement to PUSCH decoder
5 years ago
Andre Puschmann
ab210c5f3c
tiny cosmetic changes to the error messages printing 0x and clear cc_idx use
5 years ago
Francisco Paisana
7548402632
change scell activation interface to use arrays. Added a method to the scheduler to get the current set of activated carriers
5 years ago
Xavier Arteaga
c42cb92784
Fix srsENB PHY stop
5 years ago
Xavier Arteaga
76408b195e
Rename TX_DELAY and FDD_HARQ_DELAY_MS
5 years ago
Xavier Arteaga
d585cf14f3
SRSENB: phy_ue_db returns default configuration for non User C-RNTI
5 years ago
Xavier Arteaga
47b7c1b72b
SRSENB: remove assert macros from phy_ue_db.cc
5 years ago
Andre Puschmann
f2e1bfa699
refactor naming for s/p/cell structs and {enb,ue}_cc_idx
5 years ago
Xavier Arteaga
04b3416d87
Remove auto for u16
5 years ago
Xavier Arteaga
5311c37429
SRSENB PHY: check RNTI type before requesting configuration
5 years ago
Xavier Arteaga
002a68e183
SRSENB: hard-coded parametrized PUCCH DMRS correlation threshold
5 years ago
Xavier Arteaga
64caa4321b
Fix UL control decoding. Some minor aesthetic changes.
5 years ago
Ismael Gomez
4e12405fff
Remove radio_multi class and organize channels, ports and carrier buffers ( #1019 )
5 years ago
Xavier Arteaga
89a672a585
SRSENB: fix UE phy dB defect for SCell Index
5 years ago
Xavier Arteaga
5c689ed4c4
SRSENB: minor aesthetic change
5 years ago
Xavier Arteaga
8eb96747ab
SRSENB: Minor RAR RNTI fix
5 years ago
Xavier Arteaga
da701cd82b
SRSENB: Added PUSCH TA and EVM measurement. Some more PHY cleanup.
5 years ago
Pedro Alvarez
bd3598f774
Moved srsEPC to the new S1AP library. Deleted liblte_s1ap.cc and liblte_s1ap.h.
5 years ago
Xavier Arteaga
a61ff0b0fc
SRSENB cleanup phy common
5 years ago
Xavier Arteaga
cac2ee33b6
SRSENB: PHY uses tti_semaphore class instead of normal semaphores
5 years ago
Andre Puschmann
33a410bda4
fix parsing of DL/UL earfcn in cell config
...
using a single earfcn or dl_freq value that gets set by default
in the [rf] section doesn't make sense in a enb config with more
than 1 cell, so we should actually remove the earfcn/freq setting in [rf]
and only configure the radio through the values in the cell list in rr.cfg
5 years ago
Ismael Gomez
1f3aee2fc0
Fix incorrect parameters
5 years ago
Andre Puschmann
c79e202fd9
fix typo
5 years ago
Xavier Arteaga
2c534c9059
Correction of TX_DELAY and FDD_HARQ_DELAY_MS uses in srsenb PHY
5 years ago
Xavier Arteaga
9a54930430
Minor log messages and dynamic number of buffer allocation
5 years ago
Xavier Arteaga
2a6f54e13f
SRSENB: phy method cleanup and CLang tidy warning fixes
5 years ago
Xavier Arteaga
5893f66364
SRSENB: fixes, srsUE attaches srsENB
5 years ago
Xavier Arteaga
f35ed14f76
SRSENB: refactored PHY common UE database
5 years ago
Xavier Arteaga
385102fa2d
SRSENB: minor format, renaming and interface changes
5 years ago
Xavier Arteaga
bf4ecc8064
Fix srsenb PHY and unit/component tests
5 years ago
Xavier Arteaga
f9c3dd2748
more fixes in the srsenb
5 years ago
Xavier Arteaga
5dbc96458a
Sets PUCCH decode threshold as macro
5 years ago
Xavier Arteaga
231431f569
SRSENB: enabled CA PUCCH decode in eNb
5 years ago
Xavier Arteaga
40772eae19
SRSENB: UE PHY dedicated takes a flat configuration structure
5 years ago
Andre Puschmann
cccabdaf4f
removing unneeded install targets for static libs (reported by Filipe)
5 years ago
Xavier Arteaga
604e61810e
SRSENB: moved set tx/rx frequency to txrx class
5 years ago
Xavier Arteaga
31dffb785f
SRSENB: fix segmentation fault
5 years ago
Xavier Arteaga
9a853d8692
SRSUE: fix compilation
5 years ago
Xavier Arteaga
922481659b
SRSENB: minor corrections
5 years ago
Xavier Arteaga
b08c1f003e
SRSENB: enabled multiple cells from rr.cfg
5 years ago
Andre Puschmann
13bc9196b0
fix uninit memory in metrics processing
5 years ago
Andre Puschmann
be4ba504bd
fix another bunch of uninit memory in tests, and one in srsENB
5 years ago
yagoda
845c0fc2c0
fixing lcid issue with eMBMS, adding MRNTI user to stdout metrics
5 years ago
Pedro Alvarez
c5979f59eb
Clang format UE, eNB and lib ( #850 )
...
* Clang-formated UE, eNB and lib.
* Fixed compiling errors from clang-format.
* Fix linking issues introduced by clang-format
* Fix poor formating in initializing arrays of arrays.
* Fix mistake in conflict resolution on rm_turbo.c
* Re-apply clang format to gtpc_ies.h
5 years ago
Francisco Paisana
d270518d69
updated rrc to new srsasn1 version
5 years ago
Xavier Arteaga
2e1479e9d6
SRSENB: Added PHY CA PRACH workers
5 years ago
Ismael Gomez
3828e03f33
Refactor in eNodeB, add channel emulator and fixes in OFDM
...
* Added channel emulator to srsENB. Added support for fixed delay
* Bug in OFDM when using nonguru mode
* A few changes and refactor in eNodeB
5 years ago
Xavier Arteaga
73517f981e
Minor fixes
5 years ago
Xavier Arteaga
423475173d
Refactored magnitude and argument extraction from sf_worker
5 years ago
Xavier Arteaga
f9a795e985
SRSENB: cleanup and mutex rearange
5 years ago
Xavier Arteaga
10480f62b3
SRSENB: Split sf_worker and cc_worker
5 years ago
Xavier Arteaga
4238c045a4
fix unitialised value
5 years ago
Xavier Arteaga
ce9bcc1033
fix unitialised value
5 years ago
Ismael Gomez
1d83bb08e2
Changes in ACK procedure to support CA. Tested 1 cell in SISO/MIMO
5 years ago
Francisco Paisana
a2f1998350
fix issue with thread pool shut down
5 years ago
Francisco Paisana
6db0e474be
moved RA waiting procedure to a background task of the stack thread pool
5 years ago
Andre Puschmann
e0bd7f156d
replace remaining warning macros with pragma message
5 years ago
Andre Puschmann
e60a4490d2
streamline embms parameters and fix MCS selection
5 years ago
Francisco Paisana
424876c5e4
added DL TTI mask for MBMS
5 years ago
Xavier Arteaga
5e49aca835
Merge pull request #570 from softwareradiosystems/feature_256qam_fix
...
Resource allocation extended tables and PDSCH table 2 for 256QAM
5 years ago
Andre Puschmann
4e86b2f6b2
introduce layerd architecture we use for UE to eNB
...
- this allows flexible use of different PHYs and radios
- use common radio_multi (moved to lib)
5 years ago
Guillem Foreman
535325bc37
srsLTE: added resource allocation extended tables for 256QAM and integration with PDSCH test
5 years ago
Francisco Paisana
415d3418b6
reorganized enb to mirror ue director/class structure with a stack class
5 years ago
Andre Puschmann
e47010130f
extend thread class to set unique thread name in ctor
...
this will also extend all classes that use srslte::thread
to specify the name of the thread in the ctor as well
as to set the name of the worker threads in the thread pool
the thread name will be displayed in gdb.
6 years ago
Xavier Arteaga
080b4a327c
SRSUE: Refactored asynchronous cell and ue_radio. CA Fixed.
6 years ago
yagoda
c25f3b0acf
increasing rlc UM window size for eMBMS, small adjustment to eMBMS PHY common
6 years ago
Andre Puschmann
4b01a2e4a0
update copyright notice
6 years ago
Pedro Alvarez
c51a8bfe9d
Fix compilation error when using GCC 8, C++11 and C complex functions.
6 years ago
Ismael Gomez
7780b1aba5
add tdd/ca support
6 years ago
Francisco Paisana
f778c6ca8d
make mcch check
6 years ago
Pedro Alvarez
aa3a2a3dba
Fix compilation issue with GCC 8.x using complex numbers.
6 years ago
Andre Puschmann
3702a6660e
fix compilation for gcc 4.x
6 years ago
Andre Puschmann
4204321fde
fix uninitialised variables in enb during startup
6 years ago
Francisco Paisana
0204db2e12
new asn1 rrc library
6 years ago
rubund
b801c3dd4e
Fix some spelling errors detected by lintian ( #271 )
6 years ago
Andre Puschmann
22599bffda
fix bug in PUSCH decoding when multiple UEs provide HARQ feedback
6 years ago
Andre Puschmann
d981f129e0
Merge branch 'master' into next
6 years ago
Ismael Gomez
dabfbfb75a
Fixes #250
6 years ago
Igor Kim
8d48613c38
fix typo in metrics rssi CMA calculation ( #230 )
6 years ago
Ismael Gomez
6a791f1416
Change TX mutex to semaphores (mutex implementation was violating lock ownership requirement)
6 years ago
Ismael Gomez
bc9d342959
New optimization on the PHY for both UE and eNodeB ( #251 )
...
* New parallel Turbodecoder implementation in SSE/AVX 16-bit and 8-bit
* Optimised UL Interleaver
* Include TB CRC calculation in FEC encoder
* New threading priorities
6 years ago
Ismael Gomez
589e569ce9
Changes on srsENB mutexing logic to fix general race condition and deadlock issues ( #229 )
...
* fixed some issues with the UL scheduling
* Hack to fix UL scheduler
* minor fix
* Cleaned up code and fixed issue with the update_allocation function
* fixed the console printing in the enb
* log/console fix
* fixed the log print
* added a normalization factor
* RLC: entity uses dynamic instances. Simplified stop/reset/reestablish procedure. Added non-blocking interface
* Limit decimals in metrics stdout
* Changed mutexes to rwlock in RLC/RRC/MAC/PDCP to fix race conditions when removing users
* Fix deadlock bug for MIMO
* Remove headers
* Fix missing unlock causing overflows
* Do not decrease CQI when PUCCH (this is a temporal fix, requires to reduce the maximum MCS)
* Fix mutex unlock in worker
* Configurable RLC tx buffer. Default to 512 for enodeb
* Check NULL SDU in write_sdu()
* Protect RLC objects and tx_queue from being destroyed while using it
* Remove superfluous code
* Disable SIB logging
* Fix block_queue for enb
6 years ago
Xavier Arteaga
92954c1aa4
Fixed UCI decoder defect in eNb. Improved PUSCH Unit Test. PUSCH CQI is printed like UE.
6 years ago
Ismael Gomez
9d18349a08
Reduced uhd timeout
6 years ago
Ismael Gomez
3c276e7ae3
Wait to stop ENB/PHY worker
6 years ago
Ismael Gomez
56d3b9297e
Fix previous commit
6 years ago
Ismael Gomez
ca1ec9bb61
Merge branch 'next' of github.com:softwareradiosystems/srsLTE into next
6 years ago
Ismael Gomez
9a5e29ccab
Added mutex to phch_common
6 years ago
Ismael Gomez
6120f20290
Changes in RRC and S1AP to make enb more robust on UE add/rem operations.
...
* Consolidated functions in S1AP
* Fixed ASAN in some GCC
* Stop quicker the enb
* Minor typo edit
* Fixed mutexing issues in RRC and possibly RLC/PDCP when adding/removing users
6 years ago
Ismael Gomez
27a64b4d58
Decrease PUCCH threshold causing SR failure in bad SNR conditions
7 years ago
Ismael Gomez
13fc76a5ad
Minor PUSCH print error
7 years ago
yagoda
54bdfd83ec
adding support for mbsfn subframe configuration to pdsch examples
7 years ago
yagoda
e4c3f0bc30
adding mbms-gw and mch generation tables
7 years ago
yagoda
08976bb948
introducing support for embms in the enodeb PHY
7 years ago
Ismael Gomez
aa1724b8f3
Add missing-field-initializers flag and properly initialize structs
7 years ago
Andre Puschmann
dd76f85313
Merge branch 'master' into next
7 years ago
Joseph Giovatto
4e05266ea8
added printf format check for hex logs
7 years ago
David Rupprecht
06d4559294
Change include path absolut to project dir
7 years ago
Joseph Giovatto
49da57c8a1
Changed log methods to take string literal vs string object
...
to allow for format checking and save on object copy.
Fixed log format specifier warnings.
7 years ago
Andre Puschmann
bf25a5a05c
fix handling of log vector in eNB
7 years ago
Ismael Gomez
fd0c8168f0
Set to Continuous RX and TX
7 years ago
Xavier Arteaga
20934a4f89
More COverity Fixes
7 years ago
Xavier Arteaga
0299e9aae1
Fixed Aperiodic reporting RM31 for TM4 (Amarisoft proof)
7 years ago
Andre Puschmann
6a9a004311
Merge pull request #121 from jgiovatto/enb-phy-initbug
...
use vector push_back method to allocate required
7 years ago
Xavier Arteaga
0ba58d8d24
Fixed PUSCH retransmissions for non-RRC configured rnti
7 years ago
Xavier Arteaga
608e5ba088
Fixes 15MHz for MIMO srsenb
7 years ago
Xavier Arteaga
9ca4f4ab9e
Fixed PUSCH retransmission bug, last RI report and RI trace format
7 years ago
Xavier Arteaga
9ffdb1e62d
Refactored PMI/CQI/RI reporting
7 years ago
Xavier Arteaga
de654cd344
Merge branch 'next' into enbmimo
7 years ago
Xavier Arteaga
7a840d9f59
Solved RI reporting bug and improved PUSCH log trace
7 years ago
Ismael Gomez
37ee5505e9
Removed unused log_line() functions. Added DCI info string
7 years ago
Xavier Arteaga
4fec7799e2
Fixed Aperiodic RI reporting for TM1-2
7 years ago
Xavier Arteaga
0773220d86
Corrected bugs for running TM3 witha phone (up to 75Mbps@10MHz)
7 years ago
Ismael Gomez
b0a2fa3b0b
Merge branch 'enbmimo' into mob_crypto_mimo
7 years ago
Ismael Gomez
e720568e82
Revert "Added UE Mode 3-1 aperiodic reporting"
...
This reverts commit 0bd683b3c4
.
7 years ago
Ismael Gomez
eefbdbc913
Revert "Added Aperiodic mode 3-1 in enb and some more optimizations"
...
This reverts commit 8ab196901f
.
7 years ago
Xavier Arteaga
8ab196901f
Added Aperiodic mode 3-1 in enb and some more optimizations
7 years ago
Xavier Arteaga
0bd683b3c4
Added UE Mode 3-1 aperiodic reporting
7 years ago
Xavier Arteaga
0bb789b1cd
Solved Segmentation Fault error in Power Allocation
7 years ago
Xavier Arteaga
dbf10cff17
Solved PDSCH Power Allocation p_b on eNB side
7 years ago
Xavier Arteaga
af5ca314d0
Merge branch 'next' of https://github.com/softwareradiosystems/srsLTE into enbmimo
7 years ago
Xavier Arteaga
c0b9129c89
String init
7 years ago
Xavier Arteaga
e2a61af462
Added Aperiodic mode 3-1 in enb and some more optimizations
7 years ago
Xavier Arteaga
d041431c13
Merge branch 'reporting' into enbmimo
7 years ago
Xavier Arteaga
b084b153cf
Added UE Mode 3-1 aperiodic reporting
7 years ago
Ismael Gomez
72d83be8bc
Fix minor issues with adaptive retx ENB
7 years ago
Joseph Giovatto
cc420d1cb9
use vector push_back method to allocate required
...
storgae for log service objects vs using index operator.
7 years ago
Xavier Arteaga
69682d488b
eNB: Do not consider CQI/RI if PUCCH has low correlation
7 years ago
Xavier Arteaga
75957d41d7
Added DCI formats 2 and 2a inScheduler. Improved UE PHCH, corrected some MIMO bugs on both sides.
7 years ago
Xavier Arteaga
96a6d6ae9f
Merge branch 'next' into enbmimo
7 years ago
Xavier Arteaga
6985682ef0
Added 2nd Codeword interface in scheduler, plus pmi close loop reporting
7 years ago
Xavier Arteaga
af669a6cbb
Added RI reporting in enb and optimised RI computing calling time
7 years ago
Ismael Gomez
7bef0b0e7f
Merge branch 'next' into next_novolk
7 years ago
Xavier Arteaga
c8bba2f4d0
DFT optimization. memcpy removal ( #76 )
...
* Solved PHICH Segmentation fault for MIMO
* Initial Guru FFT optimitzation
* Guru (i)FFT implemented. All test passed!
* Integrated new DFT into pdsch_enodeb and pdsch_ue. Solved more DFT bugs.
* Solved Merge Errors and bugs
* Solved UL Guru bug (DC missing). Updated Init and OFDM calls for enb and ue (cell measurement too).
7 years ago
Ismael Gomez
2f44e2bf3a
Refactored cases mcs>29 for ul/dl
7 years ago
Xavier Arteaga
21355de77e
Added TM3 (1 layer only) eNB support at RRC
7 years ago
Xavier Arteaga
95897ceb71
Added TM2 (Tx diversity) support for eNB
7 years ago
Xavier Arteaga
e8da7160f0
eNB transmits diversity by default if two cell ports are configured
7 years ago
Ismael Gomez
5208c4c160
Removed unused code
7 years ago
Ismael Gomez
ca0cf017d6
Now working with variable HARQ scheduling
7 years ago
Ismael Gomez
c8dc3d1ad7
Merge branch 'next_with_variable_harq' into next_novolk
7 years ago
Ismael Gomez
d6bdabfdc0
Changed all harq delays to variables
7 years ago
Ismael Gomez
736b73bb4b
Print PDSCH iterations per codeword
7 years ago
Ismael Gomez
b59e4d08ca
fixed incorrect initialization of PUSCH estimator
7 years ago
Ismael Gomez
22f194182c
fixed memory leaks
7 years ago
Ismael Gomez
b0639ab394
resolved merge conflicts
7 years ago