merge changes from thinkpad