add eringi
merge eringi