conflict tips