Fixing unix timestamp conflicts