resolveConflicts

Resolve parameter value conflicts