1. Open a case. 2. Send an email 3. Return to case. 4. Update any field - you get the "resolve conflict page". This seems to be caused by a custom after_relationship_add logic hook on Emails. When the email is saved (depending on some custom parameters…