merge
updated core