commit with merge 2