Fixed what my conflict k-fucked

Hopefully