solve some bugs for conditions, adapt conditions to the list acronyms
resolve conflit