Fix merge conflicts with upstream