Modified config variables
FIx merge conflict index.html