Symbol order fix
Add minimal conflict handling