Fix more merge conflicts
Whitespace