commit and merge