Add conflict management to MVP features

Created by  GarettWithOneR  on January 5, 2021
2OX32U3OZBMF42GTGBNLCBP3JTVP3QEALJBLNXKKAM6NORQBJZWQC
Change contents