init repo
Merge origin/master