Configure your IDE to remove trailing spaces (as these tend to cause unneeded merge conflicts)