merged conflicts
typo fix
working event start times
udpated look of time
migrated