We have a Master-Master replication setup with one master being the active one and the other master the passive one. When the active master fails, the passive master becomes active.

In such a scenario, how crucial is conflict resolution ?
I am thinking, when master 1 fails, during its recovery, if we can empty the queue of pending transactions in master 1, thus, no conflicts will occur. I am not sure if this is possible, but would this be a good solution ?

My other question is, when the client switches over to the second master, is there a way by which it will know what transactions remained in the queue of master 1 and were not propagated to master 2. That way, it can reissue those statements again.

Please help