theme conflicts
Merge branch 'master' of https://github.com/foxydot/walker