Commiting after rebasing from upstream