Fix merge mistake