Everything fixed
Merge origin/master