some changes
merge fix