vi change
merge fixed