Adjustment to data models, util, and jive.js
Conflict resolution for datamodel sort