Resolve conflict on virtual teams