Add/delete merge-preventing whitespace/content

Seriously, when did Git ever get so picky about whitespace? <_<