Stupid merge error forgotten by me