test
test
thinkpad
merge conflict
delete .emacs file