adding genre api
fixing merge conflict