changed default version number to 0.0.0 to show plainly if the version number wasn't provided at the command line
resolved conflicts