did some stuff
Fixed conflicts