merging for commit