Fix bad merge conflict metadata.rb