committing before merging from upstream