opam + merlin file + oasis regenerate

no changes to code