add erichoco
merge