Semantic Conflict

A situation in which modifications from two branches can be merged automatically at the textual level but contradict each other in program semantics. In parallel AI agent development it is especially prominent because of the lack of cross-agent context awareness.