Managing conflict with peers