Stupid merge oversight