Fix conflict with different version number