edited to thinkpad
thinkpad added
commiting merge