small changes
merge