Merge branch 'commit'