Resolve Conflicts while merging with philips/contribution-38-control-metadata-reverb