Fixed merge conflicts properly

Eveything should be working now