resolve merge conflicts, fix daemonize package name, add missing config options