Added use case for comparing & resolving conflicting diffs