To ensure disputes are dealt with appropriately, have an HR team trained in DEI workplace conflicts and instruct your leaders to recognize where there could be tension. Above all else, you must create a workspace where employees feel safe coming to their superior or HR team to discuss conflicts regarding diverse backgrounds. Otherwise, you'll never know if there are problems when there could be.