Merge
COnfig file updated