update configure x
merge