Fix malformed CSS.
Add a new-version-available check in the merge tool.