for playing with git, including merging