readme: coflict has been removed