A conflict is forestalled for now, but don’t take anything for granted. You need to ensure that promises are kept and orders obeyed.