Title: Successfully Resolving Conflict in a Week