Tiny merge conflict fix