update prompt
added git config
merge