`DS.Adapter.resolveMapConflict` can receive two arguments
Merge pull request #887 from tricknotes/remove-not-referenced-argument

`DS.Adapter.resolveMapConflict` can receive two arguments