updated version number for latest merge