pull bro
Fixed conflicts
newvidmodel