commit from mac
merge
fix merge