Don't try to save files when you don't have the permissions to do so
Merge remote-tracking branch 'upstream/master'