Yeah, it's still going on, albeit very different. The rebels have been massively weakened and are planning for a formal surrender. On the other hand, the other group died out for a while only to re-emerge as the Khalzetian (cahl-zeTian) Front. The fighting has continued, but it has been severely decreased.
@ancientdebris