Changed some stuff
Fixed a merge conflict