Commits lein project
Fixes conflict