working on release action
resolve conflicts
lein caribou catapult