fixed conflict

@mhahn @guymorita