update surikat + some remerge (forgetted consistencies)