commit pre merge
merge and commit