@mgobirch can you make sure you're not committing changes to db/schema.rb that aren't made via migrations in your branch?

If you want to revert this, you can:
```shell
git checkout master db/schema.rb
git add db/schema.rb
git commit
```

If you want to reset your database to master completely, you can run:
```shell
git checkout master db/schema.rb
rake db:drop # Make sure you don't have any servers / consoles open or this won't work
rake db:sample
```