working!
Merge origin/master