hopefully all changes since event

Combining all the files into one to sync.