Really fix whitespace change made during conflict resolution (no bug) :-)