updated version
fixed conflict