add conflicting names support for @evan
Merge branch 'conflicting-evans'