commit before merging with upstream