merge changelogs into one, fix assembly to match master