By the way you could use the exact same scenario (two same changes in different
branches, one branch reverts it) and expect the result we have now.
It's very hard to guess the intent from that kind of merge.