Fixed timestamp conflicts