commit 1
commit the merged