addiong styling
clearing conflicts