automatic committed save
Merge fix