small change and merge