Did some stuff
Fixed conflict