Resync with upstream and start from scratch