Added timestamp to manchet fix
Added default check in convert on save for video
Resovled merge conflict in frontend