ascending location
conflict resolution merges