Fixed goddamn merge conflicts