Committing changes to branch before merging with master