fix coflict.