Fix duplicate places in manuscript and paper-conference