make a few changes
make some changes
merge