Update on genre, contributor primary key and type_prgs
Merge conflict