this file shouldn't be in the commit ... you'll notice the changes are superficial anyway. to remove it, run 
```
git checkout origin/master db/schema.rb
```
then commit the change with a sneaky amend:
```
git add .
git status 
git commit --amend
```
and force push it to github (force is required because you've re-written an entry and it freaks git out)
```
git push myfork features/small-task -f
``` 

this happens a lot with