Some changes i don't remember making
Fixed a conflict, hopefully