fix version number, fix strange conflicts