update gitconfig and prompts
merge master;