conf var added
Merge conf var