-aq_resolveConflict:delta; and tests
AQModelManagerProtocol Methods implementation