change to gitignore
git ignore conflict. the irony
Merge branch 'master' of https://github.com/foxydot/walker
Merge branch 'master' of https://github.com/foxydot/walker
gitignore