Rome was not build in one day. In this epic we going to aggregate issues that were found for conflict resolution and offline support