This setting is too painful unless you're trying to debug the connection issue
Merge remote-tracking branch 'origin/master'