Line length: Fix recent merges

No match.