Don't duplicate the same conflict entries
Don't duplicate the same conflict entries

DmitrySoshnikov/syntax,DmitrySoshnikov/syntax,DmitrySoshnikov/syntax,DmitrySoshnikov/syntax,DmitrySoshnikov/syntax,DmitrySoshnikov/syntax,DmitrySoshnikov/syntax,DmitrySoshnikov/syntax,DmitrySoshnikov/syntax