workplace conflicts correcting through diverse change