resolving ordering conflicts