Class ConflictDialog.ResolveAction