Reduce the number of resolution conflict warnings. Closes #310
Merge pull request #331 from brian-team/pass_down_user_code

Reduce the number of resolution conflict warnings