changed version number

Signed-off-by: Justin Hamilton <jhamilton@netmark.com>
fixed merge conflict.

Signed-off-by: Justin Hamilton <jhamilton@netmark.com>