Manually mering in a bunch of changes from different sources.