still has file lock errors
Close old file when you open a new one
Merge branch 'master' into ask_for_overwrite