whitespace nazi
merge resolution