There's (at least) one example where I'd rather have a conflict:

> Python: both add decorators to function

If two branches add a decorator into the same function, I definitely want to keep both, but the _order_ is of great importance.

But in fact, this makes me think that automated semantic resolution can have a lot of issues. E.g:, say two branches add the following two lines separately. Merging them requires a human considering the order of operations and how the affect the result:

    title = title.replace("_", " ")
    title = title.to_title_case()