1. A system comprising: memory for storing computer readable instructions; a processing unit for accessing the memory and executing the computer readable instructions, the computer readable instructions comprising: a conflict manager programmed to receive a message from a remote server following a re-connection between the remote server and a primary server, the message from the remote server including a resource time interval associated with a state of a given resource in a distributed system, the conflict manager being programmed to derive a corrected resource time interval for the state of the given resource based on the message from the remote server and conflicting records in a primary database.