For future reference you can should be careful to avoid these unnecessary whitespace changes.  

Git can still generate conflicts when merging on trivial stuff like whitespace.