Resolving conflicts with peers