button to timestamps
merge fix