Now, according to a joint filing in federal court, both sides have agreed to a resolution in principle. This would bring the ...