Implemented Phase 3, works with OMS
Conflict resolving