movies in an array of jsons based on genre
merge conflicts