Swap files no more\!
Suprising merge (only one file deleted)