Detect merge conflicts and prevent merging such items

[Former user]

Due to merge conflicts there took place incomplete merges - https://www.wikidata.org/w/index.php?title=Q22412570&action=history (see the entry for 29 March 2017).