Tiff and Mikah spend some time resolving their conflicts before they take on \u201cConflict Resolution.\u201d This episode of \u201cThe Office\u201d aired on May 4, 2006.