Dont stuck on error
Merge remote-tracking branch 'upstream/master' into savepass
save option