- fixed merge issue
- new version number