I upgraded using the Automatic Update Package.

There is a language error when conflicts are found...

It says for example, "Merge file and loose modified code"

"loose" should be changed to "lose"

In fact, "omit" may be a better term to use than "lose"