Committing changes before merging