Fix build against oasis 0.4.2
Add basic .merlin