some changes
merge