Re-add merge driver for db/schema.rb
This ensures that even with the -Xours option, we take the latest schema version when merging changes into EE.
This ensures that even with the -Xours option, we take the latest schema version when merging changes into EE.