Resolving conflicts on the job