Started experiment in which we detect conflicting merges