Fixed collisions and stuff
merge