resolves merge conflicts in audiomethods and metadata_methods,
temporarly disables collection indexing so other stuff works for now
objects necessary for rendering static collection  pages in the TDL so they may as
well be part of the repset of objects