merge with sigurd