edit after

Conflicts:
	src/js/pages/edittimer.js