add like
Merge branch 'feature/temp-deploy' of github.com:CommOnEcoute/videotag-widget into feature/temp-deploy
Merge branch 'feature/temp-deploy' of github.com:CommOnEcoute/videotag-widget into feature/temp-deploy

Conflicts:
	static/videotag-widget/main.js