Manually merge the rest of the changes.