update version number
fixed merge conflicts