adding timestamp to check if cached
fixing conflicts