commit from laptop
merge on laptop