ticket:10 Conflict resolution
ticket:10 Conflict resolution
ticket:10 Added choices param. to the action field, string concatenation replaced with format string
ticket:10 Conflict resolution