getting my videos on profileview
fixing merge conflict