add merge setting.
change user.name
add core.askpass