...

* REMEMBER: This is a hashcode of an object that was calculated and saved on the last pull of this object from Parent. This hash code is stored in a separate table than pulled object.

** See Merge  Merge

...

Merge

Once a conflict was detected two objects will have to be merged. To do this, a new database table "Conflicts" will have to be created.
This table will have columns: openmrs_class, first_object, second_object and more if needed.

...