updating platform
updating included dotfiles
updating merge tool