merging a bunch of changes