Merge "Remove unused key importhistoryconflict"