Commit before merging with master