Comment by joyinsky

No. The EZLN (Zapatista Army) surrendered in 1994 and in 1996 there was signed a Peace Accord with them.

The conflict in Colombia isn't ended yet though, the ELN hasn't signed the cease-fire.