Connection static
Merge origin/master