Add merlin-1.1

Sync to latest version.