had to bump version number again after conflict