make some changes
merge