added configuration for figaro env variables
fixed merge conflicts
fixed merge conflict