Merge with upstream as all but one commit are synched