For the key conflicts page, can you show the categories for the keys?
It's a bit confusing to resolve the conflicts without know what the key is for exactly,

Here's an example of a sort of confusing conflicts page: