Updates merlin to 1.7.1