Does avatar fire and ash resolve the human na vi conflict?

The single verified source provided is a Wikipedia article listing films with mid- and post-credits scenes. This article describes general trends in post-credits content but does not contain specific information about the plot resolution of Avatar: Fire and Ash or its handling of the human Na'vi conflict. Without additional evidence from reliable sources discussing the film's storyline, I cannot confirm or deny whether this conflict is resolved in the movie.