Can you please revert all the changes in schema.rb besides the ones that are relevant for your MR?