Bad merges have been mentioned a couple of times recently and I think one of the contexts with Ben's gene/protein work.

I think there are two general issues here which could be improved:

1. Merging is too easy. Because splitting/unmerging is much harder than merging, particularly after additional edits, the process should be biased to mark merging more difficult.