updated to use conf.json for everything
fixed merge conflict