Title: Resolving conflicts on the job