单词non-conflicting
网络: 允许非冲突
Non-conflicting changes from User1 will also show in the merged diagram (in this example, shapes arranged and moved).
User1的非冲突性变化也将会显示在合并后的图中（在本例中，重安排了并移动了外形）。
As User1 has not yet modified the models, the changes will be non-conflicting.
因为User1并没有更改模型，所以更改就不是冲突性的了。
The idea of replacing introduced variable names with non-conflicting names is called
用不冲突的名称替换引入的变量名，这种方法称为