Merge pull request #618 from Chris00/master

 Add "conflicts:" where needed.
oasis2opam 0.2.4