Fix merge conflics with upstream