stat base
...

Conflicts:
	js/stats.js