committing changes to merge with master