update version number after git conflict