Line length: Fix recent merges