fix conlict on Bob