some small diffs
merge