1. A method for conflict resolution, comprising: receiving a first transaction log including a first plurality of transactions performed by a first user on one or more objects in an original data model; receiving a second transaction log including a second plurality of transactions performed by a second user on the one or more objects in the original data model; converting the first plurality of transactions into a first plurality of derivative objects in a first derivative model, each of the first plurality of derivative objects comprising a respective first type indicator; converting the second plurality of transactions into a second plurality of derivative objects in a second derivative model, each of the second plurality of derivative objects comprising a corresponding second type indicator; comparing the first plurality of derivative objects with the second plurality of derivative objects; and determining whether one or more conflicts exist between one or more of the first plurality of derivative objects and one or more of the second plurality of derivative objects.