Fixed merge conflict in metadata.rb