changing conflict face