AC-52 Resolved conflicts