Add command to remove whitespace
Merge conflict
Merge conflict again