fixing bug of fle conflict