remains in conflict