user video/stats
fixing merge conflicts