add conflicting names support for @evan

https://www.pivotaltracker.com/story/show/70478826