Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.