add rebase/merge options
remove unuses hosts
vim settings
change git user config