Fix my merge mistake