merge a bunch of content changes