trying to resolve js conflict

Conflicts:
	preloader.js