work now
fixed conflict