Title: Effective Conflict Resolution