youtube parsing done
conflicts fixed