resolving conflicts
experimental changes to speed identifier lookup