Got rid of merge conflict for docs/plugins/gst-plugins-bad-plugins.hierarchy