small changes
merge fix