changed unicorn_init file
merge conflicts