* Unify precedence/associativity-based resolution with the search for a whitelisted conflict * Improve conflict error messages