opam version fix after bad merge