fix conflick