Patched up more conflicts with a previous merged set of commits.