Add new config for host
Merge remote-tracking branch 'origin/master'