updated version number
fixed conflict