[ET/PS] base lein project
[ET/PS] merge conflict