Merge changes and commit