Fixing evans last commit.

You pushed a CONFLICT. That was bad. Review the code before you push.