merging simple-git.txt