Add a .merlin file for helping merlin
Bring over changes from second attempt