adding basedir in conf and branch for develop