delete git and fetch/merge git
merge config