Data Conflicts UI

Helping the user handle data collisions. I'm trying to notify the user of what happened and why, and help them find the best way to remedy the possible data collision.