Fixed merge error

Idk why but i got a merge error that lead to heads all over the page