i didn't realize conflict resolution modes influenced ordering, but yes.