adding a merlin file
reverting to latest build system