I also changed stuff
Conflict solved