Conflicts:
	js/adapt-contrib-narrative.js