Conflicts:
	js/adapt-contrib-trickle.js