commit pre-merge to master