conflict
/ˈkɒnflɪkt/ · n.
Chinese
冲突
English
a situation where two changes cannot both be applied
💬 Example in a standup
There are two conflicts in the lock file.
锁文件里有两处冲突。