Fix merge conflict from upstream