merge tom's latest