Set 'hidden' and use 'undofile'
Merge