Sometimes you cannot avoid postponing merging, e.g. when the user is loses connectivity. It'd be interesting to read more on know how you handle longer periods of being offline, and how conflict resolution is done in that case.