Fix start and end timestamps in simple base template.
Fix merge conflict.