Commit after merging upstream