merging changes for nova conf