5 tips on conflict resolution