some changes
merge done