Changes to schema.rb
Fix conflict with schema.rb
Removed merge swap
Added new field to works
Fix conflict