removed trailing whitespace
removed optional from collection_catalog_entry
responded to code review comments from Antonio
fixed merge conflict