Fix confli