Conflict Resolution | Relay Library