upgraded to lein2, and fixed nick conflict