Some more small changes, and a merge conflict