Merge
error pequeño en vista
fix conflicts
fix schema conficts
Merge branch 'genres-yts'