[mirekrusin]

But auto merge would have to decide the order when resolving and it can't do it without custom merge.