The Federation-Cardassian armistice was ceasefire agreement during the Federation-Cardassian War signed by both the United Federation of Planets and the Cardassian Union in 2367, ending major engagements. Captain Edward Jellico helped to negotiate this armistice. However, minor skirmishes on both sides continued despite this, primarily over the unresolved issue of controlled planets along the border, such as Minos Korva, and the ongoing Occupation of Bajor. A treaty was signed between the two powers three years later. (TNG: "The Wounded", "Chain of Command, Part I", "Chain of Command, Part II", "Ensign Ro")