Stupid merge error fix