readme and comments on gitconfig
fixing merge conflict