~ emacs files + trailing wspaces
merge