sintaxis
sintaxis.y
Merge branch 'master' of https://github.com/cemeai/CIZMO

por que yo digo
conflict sintax