Talking to Nick
Fixed conflicts