Fixed merge conflict (because i was using a different computer and the wrong branch, by accident)