removed tmdb
fixed merge