added video format 3gp
updated use-package
fixed conflict