fix bug in override resolution
Merge pull request #41 from ericbmerritt/master

fix bug in override resolution