Switch from timestamps to version for test conflicts