Describir: Resolving conflicts on the job /