Test: Resolving conflicts.