Trailing whitespace isn't friendly to git or vim users.
Merge remote branch 'upstream/master' Conflicts: test_app/Gemfile.lock