change hash take 2
fixed conflict