Server is robust now.
Merge origin/master