Yeah
I'm conflicted on that one. Wouldn't the ideal state be that we try to make a 3-way-merge and only report a conflict if that fails?
So we do a 3-way merge but the problem is that it fails for two additions of forms because they would claim "L1-F1" at the same time.