Seems to be working!
Merge origin/master