Removing swap files form the merge