Fixed my merge mistake